Skip to content
Snippets Groups Projects
Commit aa4ccff1 authored by Vadim ProductEngine's avatar Vadim ProductEngine
Browse files

MAINT-261 FIXED Display previously retrieved data (until we get the update) if...

MAINT-261 FIXED Display previously retrieved data (until we get the update) if object inspector is invoked for the same object.
parent ac14d9b5
No related branches found
No related tags found
No related merge requests found
...@@ -111,6 +111,7 @@ class LLInspectObject : public LLInspect ...@@ -111,6 +111,7 @@ class LLInspectObject : public LLInspect
private: private:
LLUUID mObjectID; LLUUID mObjectID;
LLUUID mPreviousObjectID;
S32 mObjectFace; S32 mObjectFace;
viewer_media_t mMediaImpl; viewer_media_t mMediaImpl;
LLMediaEntry* mMediaEntry; LLMediaEntry* mMediaEntry;
...@@ -249,6 +250,7 @@ void LLInspectObject::onClose(bool app_quitting) ...@@ -249,6 +250,7 @@ void LLInspectObject::onClose(bool app_quitting)
{ {
// Release selection to deselect // Release selection to deselect
mObjectSelection = NULL; mObjectSelection = NULL;
mPreviousObjectID = mObjectID;
getChild<LLMenuButton>("gear_btn")->hideMenu(); getChild<LLMenuButton>("gear_btn")->hideMenu();
} }
...@@ -266,6 +268,13 @@ void LLInspectObject::update() ...@@ -266,6 +268,13 @@ void LLInspectObject::update()
LLSelectNode* nodep = selection->getFirstRootNode(); LLSelectNode* nodep = selection->getFirstRootNode();
if (!nodep) return; 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); updateButtons(nodep);
updateName(nodep); updateName(nodep);
updateDescription(nodep); updateDescription(nodep);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment