From 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:50 -0500
Subject: Second Life viewer sources 1.14.0.0

---
 linden/indra/newview/llpanelinventory.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'linden/indra/newview/llpanelinventory.cpp')

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()
 													   "Object Inventory Item Properties",
 													   mUUID,
 													   mPanel->getTaskUUID());
-		floater->open();
+		floater->open();		/*Flawfinder: ignore*/
 	}
 }
 
@@ -943,7 +943,7 @@ void LLTaskSoundBridge::openSoundPreview(void* data)
 							   self->getName(),
 							   self->mUUID,
 							   self->mPanel->getTaskUUID());
-		floaterp->open();
+		floaterp->open();	/*Flawfinder: ignore*/
 	}
 }
 
@@ -1182,7 +1182,7 @@ void LLTaskLSLBridge::openItem()
 									   mUUID);
 		LLMultiFloater* previous_host = LLFloater::getFloaterHost();
 		LLFloater::setFloaterHost(NULL);
-		editor->open();
+		editor->open();	/*Flawfinder: ignore*/
 		LLFloater::setFloaterHost(previous_host);
 
 		// keep onscreen
@@ -1824,16 +1824,16 @@ void LLPanelInventory::refresh()
 {
 	//llinfos << "LLPanelInventory::refresh()" << llendl;
 	BOOL has_inventory = FALSE;
-	LLSelectNode* node = gSelectMgr->getFirstRootNode();
+	LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
 	if(!node)
 	{
-		node = gSelectMgr->getFirstNode();
+		node = gSelectMgr->getSelection()->getFirstNode();
 	}
 	if(node)
 	{
 		LLViewerObject* object = node->getObject();
-		if(object && ((gSelectMgr->getRootObjectCount() == 1)
-					  || (gSelectMgr->getObjectCount() == 1)))
+		if(object && ((gSelectMgr->getSelection()->getRootObjectCount() == 1)
+					  || (gSelectMgr->getSelection()->getObjectCount() == 1)))
 		{
 			// determine if we need to make a request. Start with a
 			// default based on if we have inventory at all.
-- 
cgit v1.1