From 7fe82739e7738d640153c160fd341be453454605 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 7 Nov 2021 17:14:46 -0500
Subject: [PATCH] A few more hotspots..
---
indra/newview/alfloaterregiontracker.cpp | 6 +--
indra/newview/llagent.cpp | 2 +-
indra/newview/llfloaterworldmap.cpp | 54 ++++++++++++------------
indra/newview/llurldispatcher.cpp | 4 +-
indra/newview/llworldmap.cpp | 6 +--
indra/newview/llworldmapmessage.cpp | 6 +--
indra/newview/llworldmapview.cpp | 38 ++++++++---------
7 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/indra/newview/alfloaterregiontracker.cpp b/indra/newview/alfloaterregiontracker.cpp
index b33587e2bb7..c7eda4293d7 100644
--- a/indra/newview/alfloaterregiontracker.cpp
+++ b/indra/newview/alfloaterregiontracker.cpp
@@ -131,7 +131,7 @@ void ALFloaterRegionTracker::refresh()
maturity.column("region_maturity_icon").type("icon").font_halign(LLFontGL::HCENTER);
region.column("region_name").type("text").value(sim_name);
count.column("region_agent_count").type("text").value("...");
- if (LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromName(sim_name))
+ if (LLSimInfo* info = LLWorldMap::getInstanceFast()->simInfoFromName(sim_name))
{
maturity.value(info->getAccessIcon());
@@ -188,13 +188,13 @@ void ALFloaterRegionTracker::requestRegionData()
for (LLSD::map_const_iterator it = mRegionMap.beginMap(), end = mRegionMap.endMap(); it != end; ++it)
{
const auto& name = it->first;
- if (LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromName(name))
+ if (LLSimInfo* info = LLWorldMap::getInstanceFast()->simInfoFromName(name))
{
info->updateAgentCount(LLTimer::getElapsedSeconds());
}
else
{
- LLWorldMapMessage::getInstance()->sendNamedRegionRequest(name);
+ LLWorldMapMessage::getInstanceFast()->sendNamedRegionRequest(name);
}
}
mEventTimer.start();
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 6a1d67e3df6..174b39b1fd3 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4490,7 +4490,7 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global)
}
U64 handle = to_region_handle(pos_global);
- LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromHandle(handle);
+ LLSimInfo* info = LLWorldMap::getInstanceFast()->simInfoFromHandle(handle);
if(regionp && info)
{
LLVector3d region_origin = info->getGlobalOrigin();
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index cd3a57e352e..38f2867c2b8 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -346,7 +346,7 @@ LLFloaterWorldMap* LLFloaterWorldMap::getInstance()
void LLFloaterWorldMap::onClose(bool app_quitting)
{
// While we're not visible, discard the overlay images we're using
- LLWorldMap::getInstance()->clearImageRefs();
+ LLWorldMap::getInstanceFast()->clearImageRefs();
}
// virtual
@@ -369,7 +369,7 @@ void LLFloaterWorldMap::onOpen(const LLSD& key)
map_panel->updateVisibleBlocks();
// Reload items as they may have changed
- LLWorldMap::getInstance()->reloadItems();
+ LLWorldMap::getInstanceFast()->reloadItems();
// We may already have a bounding box for the regions of the world,
// so use that to adjust the view.
@@ -380,7 +380,7 @@ void LLFloaterWorldMap::onOpen(const LLSD& key)
// Start speculative download of landmarks
const LLUUID landmark_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
- LLInventoryModelBackgroundFetch::instance().start(landmark_folder_id);
+ LLInventoryModelBackgroundFetch::instanceFast().start(landmark_folder_id);
getChild<LLUICtrl>("location")->setFocus( TRUE);
gFocusMgr.triggerFocusFlash();
@@ -401,7 +401,7 @@ void LLFloaterWorldMap::onOpen(const LLSD& key)
// static
void LLFloaterWorldMap::reloadIcons(void*)
{
- LLWorldMap::getInstance()->reloadItems();
+ LLWorldMap::getInstanceFast()->reloadItems();
}
// virtual
@@ -499,9 +499,9 @@ void LLFloaterWorldMap::draw()
getChildView("Teleport")->setEnabled((BOOL)tracking_status);
// getChildView("Clear")->setEnabled((BOOL)tracking_status);
- getChildView("Show Destination")->setEnabled((BOOL)tracking_status || LLWorldMap::getInstance()->isTracking());
+ getChildView("Show Destination")->setEnabled((BOOL)tracking_status || LLWorldMap::getInstanceFast()->isTracking());
getChildView("copy_slurl")->setEnabled((mSLURL.isValid()) );
- mTrackRegionButton->setEnabled((BOOL) tracking_status || LLWorldMap::getInstance()->isTracking());
+ mTrackRegionButton->setEnabled((BOOL) tracking_status || LLWorldMap::getInstanceFast()->isTracking());
// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
childSetEnabled("Go Home",
(!rlv_handler_t::isEnabled()) || !(gRlvHandler.hasBehaviour(RLV_BHVR_TPLM) && gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)));
@@ -637,15 +637,15 @@ void LLFloaterWorldMap::trackGenericItem(const LLItemInfo &item)
void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
{
- LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
+ LLSimInfo* sim_info = LLWorldMap::getInstanceFast()->simInfoFromPosGlobal(pos_global);
if (!sim_info)
{
// We haven't found a region for that point yet, leave the tracking to the world map
LLTracker::stopTracking(false);
- LLWorldMap::getInstance()->setTracking(pos_global);
+ LLWorldMap::getInstanceFast()->setTracking(pos_global);
S32 world_x = S32(pos_global.mdV[0] / 256);
S32 world_y = S32(pos_global.mdV[1] / 256);
- LLWorldMapMessage::getInstance()->sendMapBlockRequest(world_x, world_y, world_x, world_y, true);
+ LLWorldMapMessage::getInstanceFast()->sendMapBlockRequest(world_x, world_y, world_x, world_y, true);
setDefaultBtn("");
// clicked on a non-region - turn off coord display
@@ -658,8 +658,8 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
// Down region. Show the blue circle of death!
// i.e. let the world map that this and tell it it's invalid
LLTracker::stopTracking(false);
- LLWorldMap::getInstance()->setTracking(pos_global);
- LLWorldMap::getInstance()->setTrackingInvalid();
+ LLWorldMap::getInstanceFast()->setTracking(pos_global);
+ LLWorldMap::getInstanceFast()->setTrackingInvalid();
setDefaultBtn("");
// clicked on a down region - turn off coord display
@@ -679,7 +679,7 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
std::string tooltip("");
mTrackedStatus = LLTracker::TRACKING_LOCATION;
- LLWorldMap::getInstance()->cancelTracking(); // The floater is taking over the tracking
+ LLWorldMap::getInstanceFast()->cancelTracking(); // The floater is taking over the tracking
// [RLVa:KB] - Checked: 2012-02-08 (RLVa-1.4.5) | Added: RLVa-1.4.5
LLTracker::trackLocation(pos_global, (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? full_name : RlvStrings::getString(RlvStringKeys::Hidden::Generic).c_str(), tooltip);
// [/RLVa:KB]
@@ -753,7 +753,7 @@ void LLFloaterWorldMap::updateLocation()
{
// Make sure we know where we are before setting the current user position
std::string agent_sim_name;
- gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal( agentPos, agent_sim_name );
+ gotSimName = LLWorldMap::getInstanceFast()->simNameFromPosGlobal( agentPos, agent_sim_name );
// [RLVa:KB] - Checked: 2012-02-08 (RLVa-1.4.5) | Added: RLVa-1.4.5
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
{
@@ -788,7 +788,7 @@ void LLFloaterWorldMap::updateLocation()
return; // invalid location
}
std::string sim_name;
- gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal( pos_global, sim_name );
+ gotSimName = LLWorldMap::getInstanceFast()->simNameFromPosGlobal( pos_global, sim_name );
if ((status != LLTracker::TRACKING_NOTHING) &&
(status != mTrackedStatus || pos_global != mTrackedLocation || sim_name != mTrackedSimName))
{
@@ -836,7 +836,7 @@ void LLFloaterWorldMap::updateLocation()
void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
{
- LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
+ LLSimInfo* sim_info = LLWorldMap::getInstanceFast()->simInfoFromName(region_name);
z_coord = llclamp(z_coord, 0, 4096);
if (sim_info)
{
@@ -860,9 +860,9 @@ void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S3
// pass sim name to combo box
gFloaterWorldMap->mCompletingRegionName = region_name;
- LLWorldMapMessage::getInstance()->sendNamedRegionRequest(region_name);
+ LLWorldMapMessage::getInstanceFast()->sendNamedRegionRequest(region_name);
LLStringUtil::toLower(gFloaterWorldMap->mCompletingRegionName);
- LLWorldMap::getInstance()->setTrackingCommit();
+ LLWorldMap::getInstanceFast()->setTrackingCommit();
}
}
@@ -1026,7 +1026,7 @@ void LLFloaterWorldMap::clearLocationSelection(BOOL clear_ui, BOOL dest_reached)
{
list->operateOnAll(LLCtrlListInterface::OP_DELETE);
}
- LLWorldMap::getInstance()->cancelTracking();
+ LLWorldMap::getInstanceFast()->cancelTracking();
mCompletingRegionName = "";
}
@@ -1296,15 +1296,15 @@ void LLFloaterWorldMap::onLocationCommit()
LLStringUtil::toLower(str);
mCompletingRegionName = str;
- LLWorldMap::getInstance()->setTrackingCommit();
+ LLWorldMap::getInstanceFast()->setTrackingCommit();
if (str.length() >= 3)
{
- LLWorldMapMessage::getInstance()->sendNamedRegionRequest(str);
+ LLWorldMapMessage::getInstanceFast()->sendNamedRegionRequest(str);
}
else
{
str += "#";
- LLWorldMapMessage::getInstance()->sendNamedRegionRequest(str);
+ LLWorldMapMessage::getInstanceFast()->sendNamedRegionRequest(str);
}
}
@@ -1328,7 +1328,7 @@ void LLFloaterWorldMap::onClearBtn()
{
mTrackedStatus = LLTracker::TRACKING_NOTHING;
LLTracker::stopTracking(true);
- LLWorldMap::getInstance()->cancelTracking();
+ LLWorldMap::getInstanceFast()->cancelTracking();
mSLURL = LLSLURL(); // Clear the SLURL since it's invalid
mSetToUserPosition = TRUE; // Revert back to the current user position
}
@@ -1368,7 +1368,7 @@ void LLFloaterWorldMap::onTrackRegion()
if (LLTracker::getTrackingStatus() != LLTracker::TRACKING_NOTHING)
{
std::string sim_name;
- if (LLWorldMap::getInstance()->simNameFromPosGlobal(LLTracker::getTrackedPositionGlobal(), sim_name))
+ if (LLWorldMap::getInstanceFast()->simNameFromPosGlobal(LLTracker::getTrackedPositionGlobal(), sim_name))
{
const std::string& temp_label = floaterp->getRegionLabelIfExists(sim_name);
LLSD args, payload;
@@ -1402,9 +1402,9 @@ void LLFloaterWorldMap::centerOnTarget(BOOL animate)
pos_global = LLTracker::getTrackedPositionGlobal() - gAgentCamera.getCameraPositionGlobal();
}
}
- else if(LLWorldMap::getInstance()->isTracking())
+ else if(LLWorldMap::getInstanceFast()->isTracking())
{
- pos_global = LLWorldMap::getInstance()->getTrackedPositionGlobal() - gAgentCamera.getCameraPositionGlobal();;
+ pos_global = LLWorldMap::getInstanceFast()->getTrackedPositionGlobal() - gAgentCamera.getCameraPositionGlobal();;
@@ -1588,7 +1588,7 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
S32 num_results = 0;
- std::vector<std::pair <U64, LLSimInfo*> > sim_info_vec(LLWorldMap::getInstance()->getRegionMap().begin(), LLWorldMap::getInstance()->getRegionMap().end());
+ std::vector<std::pair <U64, LLSimInfo*> > sim_info_vec(LLWorldMap::getInstanceFast()->getRegionMap().begin(), LLWorldMap::getInstanceFast()->getRegionMap().end());
std::sort(sim_info_vec.begin(), sim_info_vec.end(), SortRegionNames());
for (std::vector<std::pair <U64, LLSimInfo*> >::const_iterator it = sim_info_vec.begin(); it != sim_info_vec.end(); ++it)
@@ -1655,7 +1655,7 @@ void LLFloaterWorldMap::onCommitSearchResult()
}
LLStringUtil::toLower(sim_name);
- for (const auto& sim_info_pair : LLWorldMap::getInstance()->getRegionMap())
+ for (const auto& sim_info_pair : LLWorldMap::getInstanceFast()->getRegionMap())
{
LLSimInfo* info = sim_info_pair.second;
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index a1670351f40..04c5666d89f 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -185,7 +185,7 @@ bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, const std::string
}
// Request a region handle by name
- LLWorldMapMessage::getInstance()->sendNamedRegionRequest(slurl.getRegion(),
+ LLWorldMapMessage::getInstanceFast()->sendNamedRegionRequest(slurl.getRegion(),
LLURLDispatcherImpl::regionNameCallback,
slurl.getSLURLString(),
LLUI::getInstance()->mSettingGroups["config"]->getBOOL("SLURLTeleportDirectly")); // don't teleport
@@ -341,7 +341,7 @@ class LLTeleportHandler : public LLCommandHandler, public LLEventAPI
static void teleport_via_slapp(std::string region_name, std::string callback_url)
{
- LLWorldMapMessage::getInstance()->sendNamedRegionRequest(region_name,
+ LLWorldMapMessage::getInstanceFast()->sendNamedRegionRequest(region_name,
LLURLDispatcherImpl::regionHandleCallback,
callback_url,
true); // teleport
diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp
index 313c7faea4a..c6cd5d43fb9 100644
--- a/indra/newview/llworldmap.cpp
+++ b/indra/newview/llworldmap.cpp
@@ -145,7 +145,7 @@ void LLSimInfo::updateAgentCount(F64 time)
{
if ((time - mAgentsUpdateTime > AGENTS_UPDATE_TIMER) || mFirstAgentRequest)
{
- LLWorldMapMessage::getInstance()->sendItemRequest(MAP_ITEM_AGENT_LOCATIONS, mHandle);
+ LLWorldMapMessage::getInstanceFast()->sendItemRequest(MAP_ITEM_AGENT_LOCATIONS, mHandle);
mAgentsUpdateTime = time;
mFirstAgentRequest = false;
}
@@ -378,7 +378,7 @@ void LLWorldMap::reloadItems(bool force)
//LL_INFOS("WorldMap") << "LLWorldMap::reloadItems()" << LL_ENDL;
if (clearItems(force))
{
- auto& world_map_message = LLWorldMapMessage::instance();
+ auto& world_map_message = LLWorldMapMessage::instanceFast();
world_map_message.sendItemRequest(MAP_ITEM_TELEHUB);
world_map_message.sendItemRequest(MAP_ITEM_PG_EVENT);
world_map_message.sendItemRequest(MAP_ITEM_MATURE_EVENT);
@@ -598,7 +598,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();
+ auto& world_map_message = LLWorldMapMessage::instanceFast();
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)
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index ac4101bd9bd..cd2ac731fe5 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -165,8 +165,8 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
bool found_null_sim = false;
- auto& world_map = LLWorldMap::instance();
- auto& world_map_message = LLWorldMapMessage::instance();
+ auto& world_map = LLWorldMap::instanceFast();
+ auto& world_map_message = LLWorldMapMessage::instanceFast();
for (S32 block=0; block<num_blocks; ++block)
{
@@ -242,7 +242,7 @@ void LLWorldMapMessage::processMapItemReply(LLMessageSystem* msg, void**)
S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data);
- auto& world_map = LLWorldMap::instance();
+ auto& world_map = LLWorldMap::instanceFast();
for (S32 block=0; block<num_blocks; ++block)
{
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 197eb5588ea..73d0ed49ad3 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -347,7 +347,7 @@ void LLWorldMapView::draw()
gGL.setColorMask(true, true);
// Draw per sim overlayed information (names, mature, offline...)
- for (const auto& sim_info_pair : LLWorldMap::getInstance()->getRegionMap())
+ for (const auto& sim_info_pair : LLWorldMap::getInstanceFast()->getRegionMap())
{
U64 handle = sim_info_pair.first;
LLSimInfo* info = sim_info_pair.second;
@@ -573,13 +573,13 @@ void LLWorldMapView::draw()
drawTracking( pos_global, map_track_color, TRUE, LLTracker::getLabel(), LLTracker::getToolTip() );
}
}
- else if (LLWorldMap::getInstance()->isTracking())
+ else if (LLWorldMap::getInstanceFast()->isTracking())
{
- if (LLWorldMap::getInstance()->isTrackingInvalidLocation())
+ if (LLWorldMap::getInstanceFast()->isTrackingInvalidLocation())
{
// We know this location to be invalid, draw a blue circle
LLColor4 loading_color(0.0, 0.5, 1.0, 1.0);
- drawTracking( LLWorldMap::getInstance()->getTrackedPositionGlobal(), loading_color, TRUE, getString("InvalidLocation"), "");
+ drawTracking( LLWorldMap::getInstanceFast()->getTrackedPositionGlobal(), loading_color, TRUE, getString("InvalidLocation"), "");
}
else
{
@@ -587,7 +587,7 @@ void LLWorldMapView::draw()
double value = fmod(current_time, 2);
value = 0.5 + 0.5*cos(value * F_PI);
LLColor4 loading_color(0.0, F32(value/2), F32(value), 1.0);
- drawTracking( LLWorldMap::getInstance()->getTrackedPositionGlobal(), loading_color, TRUE, getString("Loading"), "");
+ drawTracking( LLWorldMap::getInstanceFast()->getTrackedPositionGlobal(), loading_color, TRUE, getString("Loading"), "");
}
}
@@ -611,7 +611,7 @@ void LLWorldMapView::setVisible(BOOL visible)
if (!visible)
{
// Drop the download of tiles and images priority to nil if we hide the map
- LLWorldMap::getInstance()->dropImagePriorities();
+ LLWorldMap::getInstanceFast()->dropImagePriorities();
}
}
@@ -620,7 +620,7 @@ void LLWorldMapView::drawMipmap(S32 width, S32 height)
// Compute the level of the mipmap to use for the current scale level
S32 level = LLWorldMipmap::scaleToLevel(sMapScale);
// Set the tile boost level so that unused tiles get to 0
- LLWorldMap::getInstance()->equalizeBoostLevels();
+ LLWorldMap::getInstanceFast()->equalizeBoostLevels();
// Render whatever we already have loaded if we haven't the current level
// complete and use it as a background (scaled up or scaled down)
@@ -685,7 +685,7 @@ bool LLWorldMapView::drawMipmapLevel(S32 width, S32 height, S32 level, bool load
// Convert to the mipmap level coordinates for that point (i.e. which tile to we hit)
LLWorldMipmap::globalToMipmap(pos_global[VX], pos_global[VY], level, &grid_x, &grid_y);
// Get the tile. Note: NULL means that the image does not exist (so it's considered "complete" as far as fetching is concerned)
- LLPointer<LLViewerFetchedTexture> simimage = LLWorldMap::getInstance()->getObjectsTile(grid_x, grid_y, level, load);
+ LLPointer<LLViewerFetchedTexture> simimage = LLWorldMap::getInstanceFast()->getObjectsTile(grid_x, grid_y, level, load);
if (simimage)
{
// Checks that the image has a valid texture
@@ -828,7 +828,7 @@ void LLWorldMapView::drawItems()
for (handle_list_t::iterator iter = mVisibleRegions.begin(); iter != mVisibleRegions.end(); ++iter)
{
U64 handle = *iter;
- LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromHandle(handle);
+ LLSimInfo* info = LLWorldMap::getInstanceFast()->simInfoFromHandle(handle);
if ((info == NULL) || (info->isDown()))
{
continue;
@@ -880,7 +880,7 @@ void LLWorldMapView::drawAgents()
for (handle_list_t::iterator iter = mVisibleRegions.begin(); iter != mVisibleRegions.end(); ++iter)
{
U64 handle = *iter;
- LLSimInfo* siminfo = LLWorldMap::getInstance()->simInfoFromHandle(handle);
+ LLSimInfo* siminfo = LLWorldMap::getInstanceFast()->simInfoFromHandle(handle);
if ((siminfo == NULL) || (siminfo->isDown()))
{
continue;
@@ -1080,7 +1080,7 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, MASK mask )
U64 handle = to_region_handle(pos_global);
std::string tooltip_msg;
- LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromHandle(handle);
+ LLSimInfo* info = LLWorldMap::getInstanceFast()->simInfoFromHandle(handle);
if (info)
{
LLViewerRegion *region = gAgent.getRegion();
@@ -1478,7 +1478,7 @@ bool LLWorldMapView::checkItemHit(S32 x, S32 y, LLItemInfo& item, LLUUID* id, bo
if (y < item_y - BIG_DOT_RADIUS) return false;
if (y > item_y + BIG_DOT_RADIUS) return false;
- LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromHandle(item.getRegionHandle());
+ LLSimInfo* sim_info = LLWorldMap::getInstanceFast()->simInfoFromHandle(item.getRegionHandle());
if (sim_info)
{
if (track)
@@ -1516,7 +1516,7 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
*hit_type = 0; // hit nothing
- LLWorldMap::getInstance()->cancelTracking();
+ LLWorldMap::getInstanceFast()->cancelTracking();
S32 level = LLWorldMipmap::scaleToLevel(sMapScale);
// If the zoom level is not too far out already, test hits
@@ -1532,7 +1532,7 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
for (handle_list_t::iterator iter = mVisibleRegions.begin(); iter != mVisibleRegions.end(); ++iter)
{
U64 handle = *iter;
- LLSimInfo* siminfo = LLWorldMap::getInstance()->simInfoFromHandle(handle);
+ LLSimInfo* siminfo = LLWorldMap::getInstanceFast()->simInfoFromHandle(handle);
if ((siminfo == NULL) || (siminfo->isDown()))
{
continue;
@@ -1706,7 +1706,7 @@ void LLWorldMapView::updateVisibleBlocks()
S32 world_top = world_center_y + S32(half_height / sMapScale) + 1;
//LL_INFOS("WorldMap") << "LLWorldMapView::updateVisibleBlocks() : sMapScale = " << sMapScale << ", left = " << world_left << ", right = " << world_right << ", bottom = " << world_bottom << ", top = " << world_top << LL_ENDL;
- LLWorldMap::getInstance()->updateRegions(world_left, world_bottom, world_right, world_top);
+ LLWorldMap::getInstanceFast()->updateRegions(world_left, world_bottom, world_right, world_top);
}
BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask )
@@ -1791,7 +1791,7 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
{
LLVector3d pos_global = viewPosToGlobal(x, y);
std::string sim_name;
- if (LLWorldMap::getInstance()->simNameFromPosGlobal(pos_global, sim_name))
+ if (LLWorldMap::getInstanceFast()->simNameFromPosGlobal(pos_global, sim_name))
{
LLFloaterReg::hideInstance("world_map");
LLFloaterReg::showInstance("search", LLSD().with("category", "land").with("query", sim_name));
@@ -1806,15 +1806,15 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
}
default:
{
- if (LLWorldMap::getInstance()->isTracking())
+ if (LLWorldMap::getInstanceFast()->isTracking())
{
- LLWorldMap::getInstance()->setTrackingDoubleClick();
+ LLWorldMap::getInstanceFast()->setTrackingDoubleClick();
}
else
{
// Teleport if we got a valid location
LLVector3d pos_global = viewPosToGlobal(x,y);
- LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
+ LLSimInfo* sim_info = LLWorldMap::getInstanceFast()->simInfoFromPosGlobal(pos_global);
if (sim_info && !sim_info->isDown())
{
gAgent.teleportViaLocation( pos_global );
--
GitLab