From 46d05be164bcf2935995a963a1afe106b5d2aa25 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 11 Apr 2011 22:19:20 -0700
Subject: Added Last Owner Profile button to the inspect window

---
 linden/indra/newview/llfloaterinspect.cpp          | 37 ++++++++++++++++++++++
 linden/indra/newview/llfloaterinspect.h            |  1 +
 .../skins/default/xui/en-us/floater_inspect.xml    | 13 +++++---
 3 files changed, 47 insertions(+), 4 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 6701fdb..54f68fd 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -161,10 +161,44 @@ void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
 	}
 }
 
+void LLFloaterInspect::onClickLastOwnerProfile(void* ctrl)
+{
+	if(sInstance->mObjectList->getAllSelected().size() == 0) return;
+	LLScrollListItem* first_selected =
+		sInstance->mObjectList->getFirstSelected();
+
+	if (first_selected)
+	{
+		LLUUID selected_id = first_selected->getUUID();
+		struct f : public LLSelectedNodeFunctor
+		{
+			LLUUID obj_id;
+			f(const LLUUID& id) : obj_id(id) {}
+			virtual bool apply(LLSelectNode* node)
+			{
+				return (obj_id == node->getObject()->getID());
+			}
+		} func(selected_id);
+		LLSelectNode* node = sInstance->mObjectSelection->getFirstNode(&func);
+		if(node)
+		{
+			const LLUUID& last_owner_id = node->mPermissions->getLastOwner();
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+			if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+			{
+				LLFloaterAvatarInfo::showFromDirectory(last_owner_id);
+			}
+// [/RLVa:KB]
+//			LLFloaterAvatarInfo::showFromDirectory(owner_id);
+		}
+	}
+}
+
 BOOL LLFloaterInspect::postBuild()
 {
 	mObjectList = getChild<LLScrollListCtrl>("object_list");
 	childSetAction("button owner",onClickOwnerProfile, this);
+	childSetAction("button_last_owner",onClickLastOwnerProfile, this);
 	childSetAction("button creator",onClickCreatorProfile, this);
 	childSetCommitCallback("object_list", onSelectObject);
 	return TRUE;
@@ -175,8 +209,10 @@ void LLFloaterInspect::onSelectObject(LLUICtrl* ctrl, void* user_data)
 	if(LLFloaterInspect::getSelectedUUID() != LLUUID::null)
 	{
 		//sInstance->childSetEnabled("button owner", true);
+		//sInstance->childSetEnabled("button_last_owner", true);
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e
 		sInstance->childSetEnabled("button owner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+		sInstance->childSetEnabled("button_last_owner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
 // [/RLVa:KB]
 		sInstance->childSetEnabled("button creator", true);
 	}
@@ -205,6 +241,7 @@ void LLFloaterInspect::refresh()
 	std::string creator_name;
 	S32 pos = mObjectList->getScrollPos();
 	childSetEnabled("button owner", false);
+	childSetEnabled("button_last_owner", false);
 	childSetEnabled("button creator", false);
 	LLUUID selected_uuid;
 	S32 selected_index = mObjectList->getFirstSelectedIndex();
diff --git a/linden/indra/newview/llfloaterinspect.h b/linden/indra/newview/llfloaterinspect.h
index 5d05f48..ae443f9 100644
--- a/linden/indra/newview/llfloaterinspect.h
+++ b/linden/indra/newview/llfloaterinspect.h
@@ -57,6 +57,7 @@ public:
 	virtual void onFocusReceived();
 	static void onClickCreatorProfile(void* ctrl);
 	static void onClickOwnerProfile(void* ctrl);
+	static void onClickLastOwnerProfile(void* ctrl);
 	static void onSelectObject(LLUICtrl* ctrl, void* user_data);
 	LLScrollListCtrl* mObjectList;
 protected:
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
index b28174b..5e9cacd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
@@ -18,12 +18,17 @@
 		<column label="Creation Date" name="creation_date" width="150" />
 	</scroll_list>
 	<button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
-	     label="See Owner Profile..." label_selected="" left="10"
+	     label="Owner Profile" label_selected="" left="10"
 	     mouse_opaque="true" name="button owner"
-	     tool_tip="See profile of the highlighted object&apos;s owner" width="150" />
+	     tool_tip="See profile of the highlighted object&apos;s owner" width="130" />
 	<button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
-	     label="See Creator Profile..." label_selected="" left="170"
+	     label="Last Owner Profile" label_selected="" left="150"
+	     mouse_opaque="true" name="button_last_owner"
+	     tool_tip="See profile of the highlighted object&apos;s last owner"
+	     width="130" />
+	<button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
+	     label="Creator Profile" label_selected="" left="290"
 	     mouse_opaque="true" name="button creator"
 	     tool_tip="See profile of the highlighted object&apos;s original creator"
-	     width="150" />
+	     width="130" />
 </floater>
-- 
cgit v1.1