diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelinventory.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp index bd32ad2..d9638fd 100644 --- a/linden/indra/newview/llpanelinventory.cpp +++ b/linden/indra/newview/llpanelinventory.cpp | |||
@@ -182,7 +182,7 @@ void LLTaskInvFVBridge::showProperties() | |||
182 | "Object Inventory Item Properties", | 182 | "Object Inventory Item Properties", |
183 | mUUID, | 183 | mUUID, |
184 | mPanel->getTaskUUID()); | 184 | mPanel->getTaskUUID()); |
185 | floater->open(); | 185 | floater->open(); /*Flawfinder: ignore*/ |
186 | } | 186 | } |
187 | } | 187 | } |
188 | 188 | ||
@@ -943,7 +943,7 @@ void LLTaskSoundBridge::openSoundPreview(void* data) | |||
943 | self->getName(), | 943 | self->getName(), |
944 | self->mUUID, | 944 | self->mUUID, |
945 | self->mPanel->getTaskUUID()); | 945 | self->mPanel->getTaskUUID()); |
946 | floaterp->open(); | 946 | floaterp->open(); /*Flawfinder: ignore*/ |
947 | } | 947 | } |
948 | } | 948 | } |
949 | 949 | ||
@@ -1182,7 +1182,7 @@ void LLTaskLSLBridge::openItem() | |||
1182 | mUUID); | 1182 | mUUID); |
1183 | LLMultiFloater* previous_host = LLFloater::getFloaterHost(); | 1183 | LLMultiFloater* previous_host = LLFloater::getFloaterHost(); |
1184 | LLFloater::setFloaterHost(NULL); | 1184 | LLFloater::setFloaterHost(NULL); |
1185 | editor->open(); | 1185 | editor->open(); /*Flawfinder: ignore*/ |
1186 | LLFloater::setFloaterHost(previous_host); | 1186 | LLFloater::setFloaterHost(previous_host); |
1187 | 1187 | ||
1188 | // keep onscreen | 1188 | // keep onscreen |
@@ -1824,16 +1824,16 @@ void LLPanelInventory::refresh() | |||
1824 | { | 1824 | { |
1825 | //llinfos << "LLPanelInventory::refresh()" << llendl; | 1825 | //llinfos << "LLPanelInventory::refresh()" << llendl; |
1826 | BOOL has_inventory = FALSE; | 1826 | BOOL has_inventory = FALSE; |
1827 | LLSelectNode* node = gSelectMgr->getFirstRootNode(); | 1827 | LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode(); |
1828 | if(!node) | 1828 | if(!node) |
1829 | { | 1829 | { |
1830 | node = gSelectMgr->getFirstNode(); | 1830 | node = gSelectMgr->getSelection()->getFirstNode(); |
1831 | } | 1831 | } |
1832 | if(node) | 1832 | if(node) |
1833 | { | 1833 | { |
1834 | LLViewerObject* object = node->getObject(); | 1834 | LLViewerObject* object = node->getObject(); |
1835 | if(object && ((gSelectMgr->getRootObjectCount() == 1) | 1835 | if(object && ((gSelectMgr->getSelection()->getRootObjectCount() == 1) |
1836 | || (gSelectMgr->getObjectCount() == 1))) | 1836 | || (gSelectMgr->getSelection()->getObjectCount() == 1))) |
1837 | { | 1837 | { |
1838 | // determine if we need to make a request. Start with a | 1838 | // determine if we need to make a request. Start with a |
1839 | // default based on if we have inventory at all. | 1839 | // default based on if we have inventory at all. |