Quitado código del LSL bridge y funciones dependientes
Corrección de errores previos en la migración. Cambiada la pantalla de inicio (Splash Screen)
This commit is contained in:
@@ -39,8 +39,6 @@
|
||||
#include "fsassetblacklist.h"
|
||||
#include "fscommon.h"
|
||||
#include "fskeywords.h"
|
||||
#include "fslslbridge.h"
|
||||
#include "fslslbridgerequest.h"
|
||||
#include "lggcontactsets.h"
|
||||
#include "lfsimfeaturehandler.h"
|
||||
#include "llagent.h"
|
||||
@@ -187,7 +185,6 @@ void FSRadar::updateRadarList()
|
||||
LLViewerParcelMgr& parcelmgr = LLViewerParcelMgr::instance();
|
||||
LLUIColorTable& colortable = LLUIColorTable::instance();
|
||||
LLAvatarTracker& avatartracker = LLAvatarTracker::instance();
|
||||
FSLSLBridge& bridge = FSLSLBridge::instance();
|
||||
|
||||
LFSimFeatureHandler& simfeaturehandler = LFSimFeatureHandler::instance();
|
||||
const F32 chat_range_say = (F32)simfeaturehandler.sayRange();
|
||||
@@ -219,7 +216,6 @@ void FSRadar::updateRadarList()
|
||||
static LLCachedControl<bool> sFSRadarColorNamesByDistance(gSavedSettings, "FSRadarColorNamesByDistance", false);
|
||||
static LLCachedControl<bool> sFSRadarShowMutedAndDerendered(gSavedSettings, "FSRadarShowMutedAndDerendered");
|
||||
static LLCachedControl<bool> sFSRadarEnhanceByBridge(gSavedSettings, "FSRadarEnhanceByBridge");
|
||||
bool sUseLSLBridge = bridge.canUseBridge();
|
||||
|
||||
F32 drawRadius(sRenderFarClip);
|
||||
const LLVector3d& posSelf = gAgent.getPositionGlobal();
|
||||
@@ -362,7 +358,7 @@ void FSRadar::updateRadarList()
|
||||
}
|
||||
|
||||
//schedule offset requests, if needed
|
||||
if (sUseLSLBridge && sFSRadarEnhanceByBridge && (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL)) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL))
|
||||
if (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL))
|
||||
{
|
||||
mRadarOffsetRequests.push_back(avId);
|
||||
ent->mLastZOffsetTime = now;
|
||||
@@ -667,7 +663,6 @@ void FSRadar::updateRadarList()
|
||||
if (++updatesPerRequest > FSRADAR_MAX_OFFSET_REQUESTS)
|
||||
{
|
||||
msg = msg.substr(0, msg.size() - 1);
|
||||
bridge.viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPos_Success);
|
||||
//LL_INFOS() << " OFFSET REQUEST SEGMENT"<< prefix << msg << LL_ENDL;
|
||||
msg.clear();
|
||||
updatesPerRequest = 0;
|
||||
@@ -676,7 +671,6 @@ void FSRadar::updateRadarList()
|
||||
if (updatesPerRequest > 0)
|
||||
{
|
||||
msg = msg.substr(0, msg.size() - 1);
|
||||
bridge.viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPos_Success);
|
||||
//LL_INFOS() << " OFFSET REQUEST FINAL " << prefix << msg << LL_ENDL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user