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

Fix build errors introduced in last merge

master
James Cook 2010-05-13 16:30:15 -07:00
parent 8b52454990
commit 894261e4e4
9 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llavataractions.cpp
View File

@ -79,7 +79,7 @@ void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::strin
}
LLSD args;
args["NAME"] = LLSLURL::buildCommand("agent", id, "inspect");
args["NAME"] = LLSLURL("agent", id, "inspect").getSLURLString();
LLSD payload;
payload["id"] = id;
payload["name"] = name;

7
indra/newview/llfloaterland.cpp
View File

@ -825,9 +825,9 @@ void LLPanelLandGeneral::refreshNames()
const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID();
if(auth_buyer_id.notNull())
{
std::string name;
name = LLSLURL("agent", auth_buyer_id, "inspect").getSLURLString();
mSaleInfoForSale2->setTextArg("[BUYER]", name);
std::string name;
name = LLSLURL("agent", auth_buyer_id, "inspect").getSLURLString();
mSaleInfoForSale2->setTextArg("[BUYER]", name);
}
else
{
@ -835,7 +835,6 @@ void LLPanelLandGeneral::refreshNames()
}
}
}
}
// virtual

4
indra/newview/llfloaterpay.cpp
View File

@ -430,12 +430,12 @@ void LLFloaterPay::finishPayUI(const LLUUID& target_id, BOOL is_group)
if (is_group)
{
setTitle(getString("payee_group"));
slurl = LLSLURL::buildCommand("group", target_id, "inspect");
slurl = LLSLURL("group", target_id, "inspect").getSLURLString();
}
else
{
setTitle(getString("payee_resident"));
slurl = LLSLURL::buildCommand("agent", target_id, "inspect");
slurl = LLSLURL("agent", target_id, "inspect").getSLURLString();
}
childSetText("payee_name", slurl);

6
indra/newview/llpanellandmarkinfo.cpp
View File

@ -235,7 +235,7 @@ void LLPanelLandmarkInfo::displayItemInfo(const LLInventoryItem* pItem)
// IDEVO
LLUUID creator_id = pItem->getCreatorUUID();
std::string name =
LLSLURL::buildCommand("agent", creator_id, "inspect");
LLSLURL("agent", creator_id, "inspect").getSLURLString();
//if (!gCacheName->getFullName(creator_id, name))
//{
// gCacheName->get(creator_id, FALSE,
@ -263,7 +263,7 @@ void LLPanelLandmarkInfo::displayItemInfo(const LLInventoryItem* pItem)
// gCacheName->get(group_id, TRUE,
// boost::bind(&LLPanelPlaceInfo::nameUpdatedCallback, mOwner, _2, _3));
//}
name = LLSLURL::buildCommand("group", group_id, "inspect");
name = LLSLURL("group", group_id, "inspect").getSLURLString();
}
else
{
@ -274,7 +274,7 @@ void LLPanelLandmarkInfo::displayItemInfo(const LLInventoryItem* pItem)
// gCacheName->get(owner_id, FALSE,
// boost::bind(&LLPanelPlaceInfo::nameUpdatedCallback, mOwner, _2, _3));
//}
name = LLSLURL::buildCommand("agent", owner_id, "inspect");
name = LLSLURL("agent", owner_id, "inspect").getSLURLString();
}
mOwner->setText(name);
}

18
indra/newview/llpanellogin.cpp
View File

@ -600,7 +600,8 @@ void LLPanelLogin::getFields(LLPointer<LLCredential>& credential,
LL_INFOS2("Credentials", "Authentication") << "retrieving username:" << username << LL_ENDL;
// determine if the username is a first/last form or not.
size_t separator_index = username.find_first_of(' ');
if (separator_index == username.npos)
if (separator_index == username.npos
&& !LLGridManager::getInstance()->isSystemGrid())
{
LL_INFOS2("Credentials", "Authentication") << "account: " << username << LL_ENDL;
// single username, so this is a 'clear' identifier
@ -618,8 +619,19 @@ void LLPanelLogin::getFields(LLPointer<LLCredential>& credential,
else
{
std::string first = username.substr(0, separator_index);
std::string last = username.substr(separator_index, username.npos);
LLStringUtil::trim(last);
std::string last;
if (separator_index != username.npos)
{
last = username.substr(separator_index, username.npos);
LLStringUtil::trim(last);
}
else
{
// ...on Linden grids, single username users as considered to have
// last name "Resident"
// *TODO: Make login.cgi support "account_name" like above
last = "Resident";
}
if (last.find_first_of(' ') == last.npos)
{

2
indra/newview/llpanelplaceprofile.cpp
View File

@ -448,7 +448,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel,
//gCacheName->get(parcel->getOwnerID(), FALSE,
// boost::bind(&LLPanelPlaceInfo::nameUpdatedCallback, mParcelOwner, _2, _3));
std::string parcel_owner =
LLSLURL::buildCommand("agent", parcel->getOwnerID(), "inspect");
LLSLURL("agent", parcel->getOwnerID(), "inspect").getSLURLString();
mParcelOwner->setText(parcel_owner);
gCacheName->get(region->getOwner(), false,
boost::bind(&LLPanelPlaceInfo::onNameCache, mRegionOwnerText, _2));

4
indra/newview/llviewermessage.cpp
View File

@ -5008,11 +5008,11 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
const char* source_type = (is_source_group ? "group" : "agent");
std::string source_slurl =
LLSLURL::buildCommand( source_type, source_id, "about");
LLSLURL( source_type, source_id, "about").getSLURLString();
const char* dest_type = (is_dest_group ? "group" : "agent");
std::string dest_slurl =
LLSLURL::buildCommand( dest_type, dest_id, "about");
LLSLURL( dest_type, dest_id, "about").getSLURLString();
//
//

6
indra/newview/llvoicevivox.cpp
View File

@ -6181,11 +6181,9 @@ void LLVivoxVoiceClient::lookupName(const LLUUID &id)
}
//static
void LLVivoxVoiceClient::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group)
void LLVivoxVoiceClient::onAvatarNameLookup(const LLUUID& id, const std::string& name, BOOL is_group)
{
std::string name = llformat("%s %s", first.c_str(), last.c_str());
LLVivoxVoiceClient::getInstance()->avatarNameResolved(id, name);
LLVivoxVoiceClient::getInstance()->avatarNameResolved(id, name);
}
void LLVivoxVoiceClient::avatarNameResolved(const LLUUID &id, const std::string &name)

2
indra/newview/llvoicevivox.h
View File

@ -619,7 +619,7 @@ protected:
void leaveAudioSession();
void lookupName(const LLUUID &id);
static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
static void onAvatarNameLookup(const LLUUID& id, const std::string& name, BOOL is_group);
void avatarNameResolved(const LLUUID &id, const std::string &name);
private: