1 files changed, 19 insertions, 3 deletions

diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index f9dd70d..418578e 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -1329,6 +1329,16 @@ LLView* LLInventoryPanel::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
         return panel;
 }
 
+void LLInventoryPanel::draw()
+{
+        // select the desired item (in case it wasn't loaded when the selection was requested)
+        if (mSelectThisID.notNull())
+        {
+                setSelection(mSelectThisID, false);
+        }
+        LLPanel::draw();
+}
+
 void LLInventoryPanel::setFilterTypes(U32 filter_types)
 {
         mFolders->getFilter()->setFilterTypes(filter_types);
@@ -1701,15 +1711,21 @@ void LLInventoryPanel::setSelection(const LLUUID& obj_id, BOOL take_keyboard_foc
         LLFolderViewItem* itemp = mFolders->getItemByID(obj_id);
         if(itemp && itemp->getListener())
         {
-                itemp->getListener()->arrangeAndSet(itemp,
-                                                                                          TRUE,
-                                                                                          take_keyboard_focus);
+                itemp->getListener()->arrangeAndSet(itemp, TRUE, take_keyboard_focus);
+                mSelectThisID.setNull();
+                return;
+        }
+        else
+        {
+                // save the desired item to be selected later (if/when ready)
+                mSelectThisID = obj_id;
         }
 }
 
 void LLInventoryPanel::clearSelection()
 {
         mFolders->clearSelection();
+        mSelectThisID.setNull();
 }
 
 void LLInventoryPanel::createNewItem(const std::string& name,