From 2a3c30dc7ce2be59f168f8c02d0e86e2ae916959 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 19 Mar 2010 11:48:00 -0400
Subject: EXT-6479 : Inspect Object floater doesn't update highlight and
selection EXT-4013 : Functionality loss: Inspect object (aka see a list of
creators / timestamps for all prims in a linkset)
Very simple fix that addresses some brokenness with the inspect multi-object floater.
Nature of changes is that when we re-enabled the floater (i.e. uncommented the associated code) per last-minute request, a couple of blocks of code had been left commented out.
---
indra/newview/llselectmgr.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index d733574a9d..c4ca4a65f8 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -4936,17 +4936,18 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
if (mSelectedObjects->getNumNodes())
{
LLUUID inspect_item_id= LLUUID::null;
-#if 0
LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance<LLFloaterInspect>("inspect");
if(inspect_instance)
{
inspect_item_id = inspect_instance->getSelectedUUID();
}
-#endif
- LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel();
- if (panel_task_info)
+ else
{
- inspect_item_id = panel_task_info->getSelectedUUID();
+ LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel();
+ if (panel_task_info)
+ {
+ inspect_item_id = panel_task_info->getSelectedUUID();
+ }
}
LLUUID focus_item_id = LLViewerMediaFocus::getInstance()->getFocusedObjectID();
@@ -5534,13 +5535,12 @@ void dialog_refresh_all()
LLFloaterProperties::dirtyAll();
-#if 0
LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance<LLFloaterInspect>("inspect");
if(inspect_instance)
{
inspect_instance->dirty();
}
-#endif
+
LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel();
if (panel_task_info)
{
--
cgit v1.2.3