Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid erroneously creating 'About Land' instance. Also avoid issuing 'ParcelPropertiesRequest' excessively.

Browse Source
This commit is contained in:
Shyotl
2014-08-30 23:48:56 -05:00
parent afe573d2eb
commit c7e9430f99
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llagent.cpp
View File

@@ -3973,7 +3973,8 @@ bool LLAgent::teleportCore(bool is_local)
LLFloaterWorldMap::hide(); LLFloaterWorldMap::hide();
// hide land floater too - it'll be out of date // hide land floater too - it'll be out of date
LLFloaterLand::hideInstance(); if (LLFloaterLand::findInstance())
LLFloaterLand::hideInstance();
LLViewerParcelMgr::getInstance()->deselectLand(); LLViewerParcelMgr::getInstance()->deselectLand();
LLViewerMediaFocus::getInstance()->clearFocus(); LLViewerMediaFocus::getInstance()->clearFocus();

4
indra/newview/llfloaterland.cpp
View File

@@ -257,7 +257,9 @@ LLFloaterLand::~LLFloaterLand()
// public // public
void LLFloaterLand::refresh() void LLFloaterLand::refresh()
{ {
if (LLViewerParcelMgr::getInstance()->selectionEmpty()) if (!instanceVisible())
return;
if (LLViewerParcelMgr::getInstance()->selectionEmpty() && mParcel->getParcel() == NULL)
LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal()); LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
mPanelGeneral->refresh(); mPanelGeneral->refresh();
mPanelObjects->refresh(); mPanelObjects->refresh();