From 13aa8f8faaaefea59531a970bd0b6fe1d947b756 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 3 Feb 2010 21:27:02 -0500
Subject: EXT-4344 : Object Inspector has "Sorry, not implemented yet"

Added sidetray object inspector code.
---
 indra/newview/llinspectobject.cpp                    | 6 ++++--
 indra/newview/skins/default/xui/en/notifications.xml | 8 --------
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp
index 1a5795a2ae..91cbbbf430 100644
--- a/indra/newview/llinspectobject.cpp
+++ b/indra/newview/llinspectobject.cpp
@@ -51,6 +51,7 @@
 #include "llmenubutton.h"
 #include "llresmgr.h"			// getMonetaryString
 #include "llsafehandle.h"
+#include "llsidetray.h"
 #include "lltextbox.h"			// for description truncation
 #include "lltrans.h"
 #include "llui.h"				// positionViewNearMouse()
@@ -643,8 +644,9 @@ void LLInspectObject::onClickOpen()
 
 void LLInspectObject::onClickMoreInfo()
 {
-	// *TODO: Show object info side panel, once that is implemented.
-	LLNotificationsUtil::add("ClickUnimplemented");
+	LLSD key;
+	key["task"] = "task";
+	LLSideTray::getInstance()->showPanel("sidepanel_inventory", key);	
 	closeFloater();
 }
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 636db2b59b..5c37ef75b5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -391,14 +391,6 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
      notext="No"
      yestext="Yes"/>
   </notification>
-
-  <notification
-    icon="alertmodal.tga"
-    name="ClickUnimplemented"
-    type="alertmodal">
-Sorry, not implemented yet.
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="JoinGroupCanAfford"
-- 
cgit v1.2.3