1 files changed, 7 insertions, 6 deletions

diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp
index 04b56bf..2266845 100644
--- a/linden/indra/newview/llfloaterbuy.cpp
+++ b/linden/indra/newview/llfloaterbuy.cpp
@@ -63,8 +63,6 @@ LLFloaterBuy::LLFloaterBuy()
 
 LLFloaterBuy::~LLFloaterBuy()
 {
-        gSelectMgr->deselectAll();
-
         sInstance = NULL;
 }
 
@@ -80,7 +78,9 @@ void LLFloaterBuy::reset()
 // static
 void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 {
-        if (gSelectMgr->getRootObjectCount() != 1)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+
+        if (selection->getRootObjectCount() != 1)
         {
                 gViewerWindow->alertXml("BuyOneObjectOnly");
                 return;
@@ -97,9 +97,10 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
                 sInstance = new LLFloaterBuy();
         }
         
-        sInstance->open();
+        sInstance->open(); /*Flawfinder: ignore*/
         sInstance->setFocus(TRUE);
         sInstance->mSaleInfo = sale_info;
+        sInstance->mObjectSelection = gSelectMgr->getEditSelection();
 
         // Always center the dialog.  User can change the size,
         // but purchases are important and should be center screen.
@@ -107,7 +108,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
         // mid-session and the saved rect is off-center.
         sInstance->center();
 
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = selection->getFirstRootNode();
         if (!node) return;
 
         // Set title based on sale type
@@ -181,7 +182,7 @@ void LLFloaterBuy::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();
 }