diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 8da1504f374f0b4d26c8aa4ee6f488a1ddbc1104..620a024801220f2c8ae107db736ce4f9b066af26 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -228,6 +228,8 @@ void LLNetMap::draw()
gGL.scalef(scale.mV[0], scale.mV[1], scale.mV[2]);
gGL.translatef(offset.mV[0], offset.mV[1], offset.mV[2]);
+
+ auto& viewer_camera = LLViewerCamera::instance();
{
LLLocalClipRect clip(getLocalRect());
@@ -254,7 +256,7 @@ void LLNetMap::draw()
if( rotate_map )
{
// rotate subsequent draws to agent rotation
- rotation = atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] );
+ rotation = atan2(viewer_camera.getAtAxis().mV[VX], viewer_camera.getAtAxis().mV[VY] );
gGL.rotatef( rotation * RAD_TO_DEG, 0.f, 0.f, 1.f);
}
@@ -592,8 +594,8 @@ void LLNetMap::draw()
// Draw frustum
F32 meters_to_pixels = mScale/ worldInst.getRegionWidthInMeters();
- F32 horiz_fov = LLViewerCamera::getInstance()->getView() * LLViewerCamera::getInstance()->getAspect();
- F32 far_clip_meters = LLViewerCamera::getInstance()->getFar();
+ F32 horiz_fov = viewer_camera.getView() * viewer_camera.getAspect();
+ F32 far_clip_meters = viewer_camera.getFar();
F32 far_clip_pixels = far_clip_meters * meters_to_pixels;
F32 half_width_meters = far_clip_meters * tan( horiz_fov / 2 );
@@ -643,7 +645,7 @@ void LLNetMap::draw()
gGL.pushMatrix();
{
gGL.translatef( ctr_x, ctr_y, 0 );
- gGL.rotatef( atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f);
+ gGL.rotatef( atan2(viewer_camera.getAtAxis().mV[VX], viewer_camera.getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f);
gGL.begin( LLRender::TRIANGLES );
gGL.vertex2f( 0.f, 0.f );
gGL.vertex2f( half_width_pixels, far_clip_pixels );
diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp
index 500a04f89eb8ada36cfeb651904fb5994531ae66..dc4c52998f0cfca1026e60b3af19889bd662bfae 100644
--- a/indra/newview/llworldmap.cpp
+++ b/indra/newview/llworldmap.cpp
@@ -380,12 +380,13 @@ void LLWorldMap::reloadItems(bool force)
//LL_INFOS("WorldMap") << "LLWorldMap::reloadItems()" << LL_ENDL;
if (clearItems(force))
{
- LLWorldMapMessage::getInstance()->sendItemRequest(MAP_ITEM_TELEHUB);
- LLWorldMapMessage::getInstance()->sendItemRequest(MAP_ITEM_PG_EVENT);
- LLWorldMapMessage::getInstance()->sendItemRequest(MAP_ITEM_MATURE_EVENT);
- LLWorldMapMessage::getInstance()->sendItemRequest(MAP_ITEM_ADULT_EVENT);
- LLWorldMapMessage::getInstance()->sendItemRequest(MAP_ITEM_LAND_FOR_SALE);
- LLWorldMapMessage::getInstance()->sendItemRequest(MAP_ITEM_LAND_FOR_SALE_ADULT);
+ auto& world_map_message = LLWorldMapMessage::instance();
+ world_map_message.sendItemRequest(MAP_ITEM_TELEHUB);
+ world_map_message.sendItemRequest(MAP_ITEM_PG_EVENT);
+ world_map_message.sendItemRequest(MAP_ITEM_MATURE_EVENT);
+ world_map_message.sendItemRequest(MAP_ITEM_ADULT_EVENT);
+ world_map_message.sendItemRequest(MAP_ITEM_LAND_FOR_SALE);
+ world_map_message.sendItemRequest(MAP_ITEM_LAND_FOR_SALE_ADULT);
}
}
@@ -399,9 +400,9 @@ bool LLWorldMap::insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUI
if (accesscode == 255)
{
// Checks if the track point is in it and invalidates it if it is
- if (LLWorldMap::getInstance()->isTrackingInRectangle( x_world, y_world, x_world + REGION_WIDTH_UNITS, y_world + REGION_WIDTH_UNITS))
+ if (isTrackingInRectangle( x_world, y_world, x_world + REGION_WIDTH_UNITS, y_world + REGION_WIDTH_UNITS))
{
- LLWorldMap::getInstance()->setTrackingInvalid();
+ setTrackingInvalid();
}
// return failure to insert
return false;
@@ -412,10 +413,10 @@ bool LLWorldMap::insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUI
//LL_INFOS("WorldMap") << "Map sim : " << name << ", ID : " << image_id.getString() << LL_ENDL;
// Insert the region in the region map of the world map
// Loading the LLSimInfo object with what we got and insert it in the map
- LLSimInfo* siminfo = LLWorldMap::getInstance()->simInfoFromHandle(handle);
+ LLSimInfo* siminfo = simInfoFromHandle(handle);
if (siminfo == NULL)
{
- siminfo = LLWorldMap::getInstance()->createSimInfoFromHandle(handle);
+ siminfo = createSimInfoFromHandle(handle);
}
siminfo->setName(name);
siminfo->setAccess(accesscode);
@@ -424,17 +425,17 @@ bool LLWorldMap::insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUI
siminfo->setLandForSaleImage(image_id);
// Handle the location tracking (for teleport, UI feedback and info display)
- if (LLWorldMap::getInstance()->isTrackingInRectangle( x_world, y_world, x_world + REGION_WIDTH_UNITS, y_world + REGION_WIDTH_UNITS))
+ if (isTrackingInRectangle( x_world, y_world, x_world + REGION_WIDTH_UNITS, y_world + REGION_WIDTH_UNITS))
{
if (siminfo->isDown())
{
// We were tracking this location, but it's no available
- LLWorldMap::getInstance()->setTrackingInvalid();
+ setTrackingInvalid();
}
else
{
// We were tracking this location, and it does exist and is available
- LLWorldMap::getInstance()->setTrackingValid();
+ setTrackingValid();
}
}
// return insert region success
@@ -455,10 +456,10 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
U64 handle = to_region_handle(pos);
// Get the region record for that handle or NULL if we haven't browsed it yet
- LLSimInfo* siminfo = LLWorldMap::getInstance()->simInfoFromHandle(handle);
+ LLSimInfo* siminfo = simInfoFromHandle(handle);
if (siminfo == NULL)
{
- siminfo = LLWorldMap::getInstance()->createSimInfoFromHandle(handle);
+ siminfo = createSimInfoFromHandle(handle);
}
//LL_INFOS("WorldMap") << "Process item : type = " << type << LL_ENDL;
@@ -600,6 +601,7 @@ void LLWorldMap::updateRegions(S32 x0, S32 y0, S32 x1, S32 y1)
y1 = y1 / MAP_BLOCK_SIZE;
// Load the region info those blocks
+ auto& world_map_message = LLWorldMapMessage::instance();
for (S32 block_x = llmax(x0, 0); block_x <= llmin(x1, MAP_BLOCK_RES-1); ++block_x)
{
for (S32 block_y = llmax(y0, 0); block_y <= llmin(y1, MAP_BLOCK_RES-1); ++block_y)
@@ -608,7 +610,7 @@ void LLWorldMap::updateRegions(S32 x0, S32 y0, S32 x1, S32 y1)
if (!mMapBlockLoaded[offset])
{
//LL_INFOS("WorldMap") << "Loading Block (" << block_x << "," << block_y << ")" << LL_ENDL;
- LLWorldMapMessage::getInstance()->sendMapBlockRequest(block_x * MAP_BLOCK_SIZE, block_y * MAP_BLOCK_SIZE, (block_x * MAP_BLOCK_SIZE) + MAP_BLOCK_SIZE - 1, (block_y * MAP_BLOCK_SIZE) + MAP_BLOCK_SIZE - 1);
+ world_map_message.sendMapBlockRequest(block_x * MAP_BLOCK_SIZE, block_y * MAP_BLOCK_SIZE, (block_x * MAP_BLOCK_SIZE) + MAP_BLOCK_SIZE - 1, (block_y * MAP_BLOCK_SIZE) + MAP_BLOCK_SIZE - 1);
mMapBlockLoaded[offset] = true;
}
}
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h
index 337d2b2a855730f0dd8cfe8693e1ac50a22c4c96..9e4e4ac554a37381db1adab08b0aec30c3c908ae 100644
--- a/indra/newview/llworldmap.h
+++ b/indra/newview/llworldmap.h
@@ -213,8 +213,8 @@ class LLWorldMap final : public LLSingleton<LLWorldMap>
// Insert a region and items in the map global instance
// Note: x_world and y_world in world coordinates (meters)
- static bool insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUID& uuid, U32 accesscode, U32 region_flags);
- static bool insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID& uuid, U32 type, S32 extra, S32 extra2);
+ bool insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUID& uuid, U32 accesscode, U32 region_flags);
+ bool insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID& uuid, U32 type, S32 extra, S32 extra2);
// Get info on sims (region) : note that those methods only search the range of loaded sims (the one that are being browsed)
// *not* the entire world. So a NULL return does not mean a down or unexisting region, just an out of range region.
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index 8be340de4c42ec8d95073e2b8e7ae8616502d80e..8aba44f6a0f498c888b85a881b290f030be0b815 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -165,6 +165,9 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
bool found_null_sim = false;
+ auto& world_map = LLWorldMap::instance();
+ auto& world_map_message = LLWorldMapMessage::instance();
+
for (S32 block=0; block<num_blocks; ++block)
{
U16 x_regions;
@@ -191,16 +194,16 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
llassert(!name.empty());
// Insert that region in the world map, if failure, flag it as a "null_sim"
- if (!(LLWorldMap::getInstance()->insertRegion(x_world, y_world, name, image_id, (U32)accesscode, region_flags)))
+ if (!(world_map.insertRegion(x_world, y_world, name, image_id, (U32)accesscode, region_flags)))
{
found_null_sim = true;
}
// If we hit a valid tracking location, do what needs to be done app level wise
- if (LLWorldMap::getInstance()->isTrackingValidLocation())
+ if (world_map.isTrackingValidLocation())
{
- LLVector3d pos_global = LLWorldMap::getInstance()->getTrackedPositionGlobal();
- if (LLWorldMap::getInstance()->isTrackingDoubleClick())
+ LLVector3d pos_global = world_map.getTrackedPositionGlobal();
+ if (world_map.isTrackingDoubleClick())
{
// Teleport if the user double clicked
gAgent.teleportViaLocation(pos_global);
@@ -210,19 +213,19 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
}
// Handle the SLURL callback if any
- url_callback_t callback = LLWorldMapMessage::getInstance()->mSLURLCallback;
+ url_callback_t callback = world_map_message.mSLURLCallback;
if(callback != NULL)
{
U64 handle = to_region_handle(x_world, y_world);
// Check if we reached the requested region
- if ((LLStringUtil::compareInsensitive(LLWorldMapMessage::getInstance()->mSLURLRegionName, name)==0)
- || (LLWorldMapMessage::getInstance()->mSLURLRegionHandle == handle))
+ if ((LLStringUtil::compareInsensitive(world_map_message.mSLURLRegionName, name)==0)
+ || (world_map_message.mSLURLRegionHandle == handle))
{
- LLWorldMapMessage::getInstance()->mSLURLCallback = NULL;
- LLWorldMapMessage::getInstance()->mSLURLRegionName.clear();
- LLWorldMapMessage::getInstance()->mSLURLRegionHandle = 0;
+ world_map_message.mSLURLCallback = NULL;
+ world_map_message.mSLURLRegionName.clear();
+ world_map_message.mSLURLRegionHandle = 0;
- callback(handle, LLWorldMapMessage::getInstance()->mSLURL, image_id, LLWorldMapMessage::getInstance()->mSLURLTeleport);
+ callback(handle, world_map_message.mSLURL, image_id, world_map_message.mSLURLTeleport);
}
}
}
@@ -239,6 +242,8 @@ void LLWorldMapMessage::processMapItemReply(LLMessageSystem* msg, void**)
S32 num_blocks = msg->getNumberOfBlocks("Data");
+ auto& world_map = LLWorldMap::instance();
+
for (S32 block=0; block<num_blocks; ++block)
{
U32 X, Y;
@@ -252,7 +257,7 @@ void LLWorldMapMessage::processMapItemReply(LLMessageSystem* msg, void**)
msg->getS32Fast(_PREHASH_Data, _PREHASH_Extra, extra, block);
msg->getS32Fast(_PREHASH_Data, _PREHASH_Extra2, extra2, block);
- LLWorldMap::getInstance()->insertItem(X, Y, name, uuid, type, extra, extra2);
+ world_map.insertItem(X, Y, name, uuid, type, extra, extra2);
}
}