Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Instead of "?object_not_owner" display " (Owner)" appended on Object IM Info Floater

Browse Source 
Translators may want to update floater_object_im_info.xml, string "owner" was added.
This commit is contained in:
Inusaito Sayori
2015-02-13 02:56:52 -05:00
parent a2058bc1e8
commit e9a517985b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloaterobjectiminfo.cpp
View File

@@ -79,7 +79,7 @@ BOOL LLFloaterObjectIMInfo::postBuild()
{ {
getChild<LLUICtrl>("Mute")->setCommitCallback(boost::bind(&LLFloaterObjectIMInfo::onClickMute, this)); 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>("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; return true;
} }
@@ -104,7 +104,11 @@ void LLFloaterObjectIMInfo::update(const LLSD& data)
childSetVisible("Slurl",have_slurl); childSetVisible("Slurl",have_slurl);
childSetText("ObjectName",mName); 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); childSetText("OwnerName", LLStringUtil::null);
getChildView("ObjectID")->setValue(data["object_id"].asUUID()); getChildView("ObjectID")->setValue(data["object_id"].asUUID());

3
indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
View File

@@ -26,7 +26,7 @@
border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top" border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
font="SansSerif" height="20" is_unicode="false" left="70" hover="true" font="SansSerif" height="20" is_unicode="false" left="70" hover="true"
max_length="254" mouse_opaque="true" name="Slurl" font-style="UNDERLINE" 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. --> <!-- 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" <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" <button bottom_delta="-28" font="SansSerif" halign="center" height="20" label="Mute Owner"
label_selected="Mute Owner" left="70" mouse_opaque="true" name="Mute" label_selected="Mute Owner" left="70" mouse_opaque="true" name="Mute"
width="160" /> width="160" />
<string name="owner" value=" (Owner)"/>
</floater> </floater>