diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerregion.cpp | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp index 0a8d9a8..643df1e 100644 --- a/linden/indra/newview/llviewerregion.cpp +++ b/linden/indra/newview/llviewerregion.cpp | |||
@@ -696,7 +696,10 @@ void LLViewerRegion::calculateCameraDistance() | |||
696 | mCameraDistanceSquared = (F32)(gAgent.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared(); | 696 | mCameraDistanceSquared = (F32)(gAgent.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared(); |
697 | } | 697 | } |
698 | 698 | ||
699 | // ---------------- Friends ---------------- | 699 | U32 LLViewerRegion::getNetDetailsForLCD() |
700 | { | ||
701 | return mPingDelay; | ||
702 | } | ||
700 | 703 | ||
701 | std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion) | 704 | std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion) |
702 | { | 705 | { |
@@ -868,7 +871,7 @@ public: | |||
868 | 871 | ||
869 | for(int i=0; | 872 | for(int i=0; |
870 | locs_it != locs.endArray(); | 873 | locs_it != locs.endArray(); |
871 | i++, locs_it++, agents_it++) | 874 | i++, locs_it++) |
872 | { | 875 | { |
873 | U8 | 876 | U8 |
874 | x = locs_it->get("X").asInteger(), | 877 | x = locs_it->get("X").asInteger(), |
@@ -901,6 +904,10 @@ public: | |||
901 | avatar_ids->put(agent_id); | 904 | avatar_ids->put(agent_id); |
902 | } | 905 | } |
903 | } | 906 | } |
907 | if (has_agent_data) | ||
908 | { | ||
909 | agents_it++; | ||
910 | } | ||
904 | } | 911 | } |
905 | } | 912 | } |
906 | }; | 913 | }; |
@@ -1342,30 +1349,35 @@ void LLViewerRegion::setSeedCapability(const std::string& url) | |||
1342 | setCapability("Seed", url); | 1349 | setCapability("Seed", url); |
1343 | 1350 | ||
1344 | LLSD capabilityNames = LLSD::emptyArray(); | 1351 | LLSD capabilityNames = LLSD::emptyArray(); |
1352 | capabilityNames.append("ChatSessionRequest"); | ||
1353 | capabilityNames.append("CopyInventoryFromNotecard"); | ||
1354 | capabilityNames.append("DispatchRegionInfo"); | ||
1355 | capabilityNames.append("EventQueueGet"); | ||
1345 | capabilityNames.append("MapLayer"); | 1356 | capabilityNames.append("MapLayer"); |
1346 | capabilityNames.append("MapLayerGod"); | 1357 | capabilityNames.append("MapLayerGod"); |
1347 | capabilityNames.append("NewFileAgentInventory"); | 1358 | capabilityNames.append("NewFileAgentInventory"); |
1348 | capabilityNames.append("EventQueueGet"); | 1359 | capabilityNames.append("ParcelGodReserveForNewbie"); |
1360 | capabilityNames.append("ParcelVoiceInfoRequest"); | ||
1361 | capabilityNames.append("ProvisionVoiceAccountRequest"); | ||
1362 | capabilityNames.append("RemoteParcelRequest"); | ||
1363 | capabilityNames.append("RequestTextureDownload"); | ||
1364 | capabilityNames.append("SearchStatRequest"); | ||
1365 | capabilityNames.append("SearchStatTracking"); | ||
1366 | capabilityNames.append("SendPostcard"); | ||
1367 | capabilityNames.append("SendUserReport"); | ||
1368 | capabilityNames.append("SendUserReportWithScreenshot"); | ||
1369 | capabilityNames.append("ServerReleaseNotes"); | ||
1349 | capabilityNames.append("UpdateGestureAgentInventory"); | 1370 | capabilityNames.append("UpdateGestureAgentInventory"); |
1350 | capabilityNames.append("UpdateNotecardAgentInventory"); | 1371 | capabilityNames.append("UpdateNotecardAgentInventory"); |
1351 | capabilityNames.append("UpdateScriptAgentInventory"); | 1372 | capabilityNames.append("UpdateScriptAgentInventory"); |
1352 | capabilityNames.append("UpdateGestureTaskInventory"); | 1373 | capabilityNames.append("UpdateGestureTaskInventory"); |
1353 | capabilityNames.append("UpdateNotecardTaskInventory"); | 1374 | capabilityNames.append("UpdateNotecardTaskInventory"); |
1354 | capabilityNames.append("UpdateScriptTaskInventory"); | 1375 | capabilityNames.append("UpdateScriptTaskInventory"); |
1355 | capabilityNames.append("SendPostcard"); | ||
1356 | capabilityNames.append("ViewerStartAuction"); | 1376 | capabilityNames.append("ViewerStartAuction"); |
1357 | capabilityNames.append("ParcelGodReserveForNewbie"); | ||
1358 | capabilityNames.append("SendUserReport"); | ||
1359 | capabilityNames.append("SendUserReportWithScreenshot"); | ||
1360 | capabilityNames.append("RequestTextureDownload"); | ||
1361 | capabilityNames.append("UntrustedSimulatorMessage"); | 1377 | capabilityNames.append("UntrustedSimulatorMessage"); |
1362 | capabilityNames.append("ParcelVoiceInfoRequest"); | ||
1363 | capabilityNames.append("ChatSessionRequest"); | ||
1364 | capabilityNames.append("ViewerStats"); | 1378 | capabilityNames.append("ViewerStats"); |
1365 | capabilityNames.append("ProvisionVoiceAccountRequest"); | 1379 | // Please add new capabilities alphabetically to reduce |
1366 | capabilityNames.append("ServerReleaseNotes"); | 1380 | // merge conflicts. |
1367 | capabilityNames.append("CopyInventoryFromNotecard"); | ||
1368 | capabilityNames.append("DispatchRegionInfo"); | ||
1369 | 1381 | ||
1370 | llinfos << "posting to seed " << url << llendl; | 1382 | llinfos << "posting to seed " << url << llendl; |
1371 | 1383 | ||