1 files changed, 8 insertions, 7 deletions

diff --git a/linden/indra/newview/llfloaterbuycontents.cpp b/linden/indra/newview/llfloaterbuycontents.cpp
index 4f6f52e..1deb1ab 100644
--- a/linden/indra/newview/llfloaterbuycontents.cpp
+++ b/linden/indra/newview/llfloaterbuycontents.cpp
@@ -68,8 +68,6 @@ LLFloaterBuyContents::LLFloaterBuyContents()
 
 LLFloaterBuyContents::~LLFloaterBuyContents()
 {
-        gSelectMgr->deselectAll();
-
         sInstance = NULL;
 }
 
@@ -77,7 +75,9 @@ LLFloaterBuyContents::~LLFloaterBuyContents()
 // static
 void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
 {
-        if (gSelectMgr->getRootObjectCount() != 1)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+
+        if (selection->getRootObjectCount() != 1)
         {
                 gViewerWindow->alertXml("BuyContentsOneOnly");
                 return;
@@ -94,8 +94,9 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
                 sInstance = new LLFloaterBuyContents();
         }
 
-        sInstance->open();
+        sInstance->open(); /*Flawfinder: ignore*/
         sInstance->setFocus(TRUE);
+        sInstance->mObjectSelection = gSelectMgr->getEditSelection();
 
         // Always center the dialog.  User can change the size,
         // but purchases are important and should be center screen.
@@ -115,11 +116,11 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
         sInstance->mSaleInfo = sale_info;
 
         // Update the display
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = selection->getFirstRootNode();
         if (!node) return;
         if(node->mPermissions->isGroupOwned())
         {
-                char group_name[MAX_STRING];
+                char group_name[MAX_STRING];    /*Flawfinder: ignore*/
                 gCacheName->getGroupName(owner_id, group_name);
                 owner_name.assign(group_name);
         }
@@ -131,7 +132,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
         // Must do this after the floater is created, because
         // sometimes the inventory is already there and 
         // the callback is called immediately.
-        LLViewerObject* obj = gSelectMgr->getFirstRootObject();
+        LLViewerObject* obj = selection->getFirstRootObject();
         sInstance->registerVOInventoryListener(obj,NULL);
         sInstance->requestVOInventory();
 }