summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterland.cpp23
-rw-r--r--indra/newview/llfloatersellland.cpp16
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml15
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_setup.xml27
4 files changed, 49 insertions, 32 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index b008189b0d..78dea87bfd 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -37,7 +37,7 @@
#include "llfloaterland.h"
-#include "llcachename.h"
+#include "llavatarnamecache.h"
#include "llfocusmgr.h"
#include "llnotificationsutil.h"
#include "llparcel.h"
@@ -586,6 +586,8 @@ void LLPanelLandGeneral::refresh()
parcel, GP_LAND_SET_SALE_INFO);
BOOL can_be_sold = owner_sellable || estate_manager_sellable;
+ can_be_sold = true;
+
const LLUUID &owner_id = parcel->getOwnerID();
BOOL is_public = parcel->isPublic();
@@ -1387,9 +1389,7 @@ bool LLPanelLandObjects::callbackReturnOwnerObjects(const LLSD& notification, co
}
else
{
- std::string full_name;
- gCacheName->getFullName(owner_id, full_name);
- args["NAME"] = full_name;
+ args["NAME"] = LLSLURL("agent", owner_id, "inspect").getSLURLString();
LLNotificationsUtil::add("OtherObjectsReturned", args);
}
send_return_objects_message(parcel->getLocalID(), RT_OWNER);
@@ -1607,9 +1607,9 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
}
// Placeholder for name.
- std::string name;
- gCacheName->getFullName(owner_id, name);
- item_params.columns.add().value(name).font(FONT).column("name");
+ LLAvatarName av_name;
+ LLAvatarNameCache::get(owner_id, &av_name);
+ item_params.columns.add().value(av_name.getNameAndSLID()).font(FONT).column("name");
object_count_str = llformat("%d", object_count);
item_params.columns.add().value(object_count_str).font(FONT).column("count");
@@ -1718,9 +1718,7 @@ void LLPanelLandObjects::onClickReturnOwnerObjects(void* userdata)
}
else
{
- std::string name;
- gCacheName->getFullName(owner_id, name);
- args["NAME"] = name;
+ args["NAME"] = LLSLURL("agent", owner_id, "inspect").getSLURLString();
LLNotificationsUtil::add("ReturnObjectsOwnedByUser", args, LLSD(), boost::bind(&LLPanelLandObjects::callbackReturnOwnerObjects, panelp, _1, _2));
}
}
@@ -1779,10 +1777,7 @@ void LLPanelLandObjects::onClickReturnOtherObjects(void* userdata)
}
else
{
- std::string name;
- gCacheName->getFullName(owner_id, name);
- args["NAME"] = name;
-
+ args["NAME"] = LLSLURL("agent", owner_id, "inspect").getSLURLString();
LLNotificationsUtil::add("ReturnObjectsNotOwnedByUser", args, LLSD(), boost::bind(&LLPanelLandObjects::callbackReturnOtherObjects, panelp, _1, _2));
}
}
diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index 9dddbd998a..ebb73baffb 100644
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -33,6 +33,7 @@
#include "llfloatersellland.h"
+#include "llavatarnamecache.h"
#include "llfloateravatarpicker.h"
#include "llfloaterreg.h"
#include "llfloaterland.h"
@@ -47,6 +48,8 @@
#include "lluictrlfactory.h"
#include "llviewerwindow.h"
+class LLAvatarName;
+
// defined in llfloaterland.cpp
void send_parcel_select_objects(S32 parcel_local_id, U32 return_type,
uuid_list_t* return_ids = NULL);
@@ -97,6 +100,8 @@ private:
void callbackAvatarPick(const std::vector<std::string>& names, const uuid_vec_t& ids);
+ void onBuyerNameCache(const LLAvatarName& av_name);
+
public:
virtual BOOL postBuild();
@@ -230,12 +235,17 @@ void LLFloaterSellLandUI::updateParcelInfo()
if(mSellToBuyer)
{
- std::string name;
- gCacheName->getFullName(mAuthorizedBuyer, name);
- childSetText("sell_to_agent", name);
+ LLAvatarNameCache::get(mAuthorizedBuyer,
+ boost::bind(&LLFloaterSellLandUI::onBuyerNameCache, this, _2));
}
}
+void LLFloaterSellLandUI::onBuyerNameCache(const LLAvatarName& av_name)
+{
+ childSetText("sell_to_agent", av_name.getNameAndSLID());
+ childSetToolTip("sell_to_agent", av_name.mUsername);
+}
+
void LLFloaterSellLandUI::setBadge(const char* id, Badge badge)
{
static std::string badgeOK("badge_ok.j2c");
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index e3ee14771c..88b60ea3c8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -205,7 +205,7 @@ Automatic position for:
layout="topleft"
left="30"
name="UI Size:"
- top_pad="5"
+ top_pad="15"
width="300">
UI size
</text>
@@ -316,21 +316,10 @@ Automatic position for:
label="Other Devices"
left="30"
name="joystick_setup_button"
- top_pad="5"
+ top_pad="10"
width="155">
<button.commit_callback
function="Floater.Show"
parameter="pref_joystick" />
</button>
- <check_box
- control_name="UseDisplayNames"
- follows="top|left"
- height="15"
- label="Use Display Names (PLACEHOLDER)"
- layout="topleft"
- left="30"
- name="display_names_check"
- width="237"
- tool_tip="Check to use display names in chat, IM, name tags, etc."
- top_pad="5"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 2c6ceeef2e..7148aba00a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -115,7 +115,7 @@
layout="topleft"
left="77"
name="connection_port_enabled"
- top_pad="20"
+ top_pad="15"
width="256">
<check_box.commit_callback
function="Notification.Show"
@@ -147,7 +147,7 @@
left="80"
mouse_opaque="false"
name="cache_size_label_l"
- top_pad="20"
+ top_pad="10"
width="200">
Cache size
</text>
@@ -375,4 +375,27 @@
name="web_proxy_port"
top_delta="0"
width="145" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="30"
+ name="Communications:"
+ top_pad="5"
+ width="300">
+ Communications:
+ </text>
+ <check_box
+control_name="UseDisplayNames"
+follows="top|left"
+height="15"
+label="Use Display Names"
+layout="topleft"
+left_delta="50"
+name="display_names_check"
+width="237"
+tool_tip="Check to use display names in chat, IM, name tags, etc."
+top_pad="10"/>
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 22:32:18 +0000