livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Land display name updates 

reviewed by James
meow-7.2.2
Leyla Farazha 2010-05-19 11:38:29 -07:00
parent efa00298b3
commit da1a39c935
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llfloaterland.cpp
View File

@ -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));
}
}

16
indra/newview/llfloatersellland.cpp
View File

@ -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.mSLID);
}
void LLFloaterSellLandUI::setBadge(const char* id, Badge badge)
{
static std::string badgeOK("badge_ok.j2c");