From e9a517985b153a902a6fde771cf12da5bce62cf2 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 13 Feb 2015 02:56:52 -0500
Subject: [PATCH] Instead of "?object_not_owner" display " (Owner)" appended on
 Object IM Info Floater

Translators may want to update floater_object_im_info.xml, string "owner" was added.
---
 indra/newview/llfloaterobjectiminfo.cpp                   | 8 ++++++--
 .../skins/default/xui/en-us/floater_object_im_info.xml    | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llfloaterobjectiminfo.cpp b/indra/newview/llfloaterobjectiminfo.cpp
index ce65e8d8c..79c121375 100644
--- a/indra/newview/llfloaterobjectiminfo.cpp
+++ b/indra/newview/llfloaterobjectiminfo.cpp
@@ -79,7 +79,7 @@ BOOL LLFloaterObjectIMInfo::postBuild()
 {
 	getChild<LLUICtrl>("Mute")->setCommitCallback(boost::bind(&LLFloaterObjectIMInfo::onClickMute, this));
 	getChild<LLTextBox>("OwnerName")->setClickedCallback(boost::bind(boost::ref(mGroupOwned) ? boost::bind(LLGroupActions::show, boost::ref(mOwnerID)) : boost::bind(show_avatar_profile, boost::ref(mOwnerID))));
-	getChild<LLTextBox>("Slurl")->setClickedCallback(boost::bind(LLUrlAction::showLocationOnMap, "secondlife://" + static_cast<std::string>(boost::ref(mSLurl))));
+	getChild<LLTextBox>("Slurl")->setClickedCallback(boost::bind(LLUrlAction::executeSLURL, boost::bind(std::plus<std::string>(), "secondlife:///app/worldmap/", boost::ref(mSLurl))));
 
 	return true;
 }
@@ -104,7 +104,11 @@ void LLFloaterObjectIMInfo::update(const LLSD& data)
 	childSetVisible("Slurl",have_slurl);
 
 	childSetText("ObjectName",mName);
-	childSetText("Slurl",mSLurl);
+	std::string slurl(mSLurl);
+	std::string::size_type i = slurl.rfind("?owner_not_object");
+	if (i != std::string::npos)
+		slurl.erase(i) += getString("owner");
+	childSetText("Slurl", slurl);
 	childSetText("OwnerName", LLStringUtil::null);
 	getChildView("ObjectID")->setValue(data["object_id"].asUUID());
 
diff --git a/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml b/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
index 318f614e4..7f2618230 100644
--- a/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
@@ -26,7 +26,7 @@
 			     border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
 			     font="SansSerif" height="20" is_unicode="false" left="70" hover="true"
 			     max_length="254" mouse_opaque="true" name="Slurl" font-style="UNDERLINE"
-			     width="200" hover_cursor="UI_CURSOR_HAND" text_color="TextLinkColor" hover_color="TextLinkHoverColor"/>
+			     hover_cursor="UI_CURSOR_HAND" text_color="TextLinkColor" hover_color="TextLinkHoverColor"/>
   
   <!-- A new viewer talking to an old sim will not have a slurl available and will show this. -->
   <text bevel_style="none" border_style="line" border_visible="false"
@@ -55,4 +55,5 @@
   <button bottom_delta="-28" font="SansSerif" halign="center" height="20" label="Mute Owner"
          label_selected="Mute Owner" left="70" mouse_opaque="true" name="Mute"
          width="160" />
+  <string name="owner" value=" (Owner)"/>
 </floater>