livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-261 FIXED Display previously retrieved data (until we get the update) if object inspector is invoked for the same object.

master
Vadim ProductEngine 2012-03-19 16:44:50 +02:00
parent ac14d9b50b
commit aa4ccff19f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llinspectobject.cpp
View File

@ -111,6 +111,7 @@ private:
private:
LLUUID mObjectID;
LLUUID mPreviousObjectID;
S32 mObjectFace;
viewer_media_t mMediaImpl;
LLMediaEntry* mMediaEntry;
@ -249,6 +250,7 @@ void LLInspectObject::onClose(bool app_quitting)
{
// Release selection to deselect
mObjectSelection = NULL;
mPreviousObjectID = mObjectID;
getChild<LLMenuButton>("gear_btn")->hideMenu();
}
@ -266,6 +268,13 @@ void LLInspectObject::update()
LLSelectNode* nodep = selection->getFirstRootNode();
if (!nodep) return;
// If we don't have fresh object info yet and it's the object we inspected last time,
// keep showing the previously retrieved data until we get the update.
if (!nodep->mValid && nodep->getObject()->getID() == mPreviousObjectID)
{
return;
}
updateButtons(nodep);
updateName(nodep);
updateDescription(nodep);