Switch to using typedef'd uuid types everywhere and auto for iterators
Oh, and some related opts.
This commit is contained in:
@@ -213,7 +213,7 @@ private:
|
||||
bool send_start_session_messages(
|
||||
const LLUUID& temp_session_id,
|
||||
const LLUUID& other_participant_id,
|
||||
const std::vector<LLUUID>& ids,
|
||||
const uuid_vec_t& ids,
|
||||
EInstantMessage dialog)
|
||||
{
|
||||
if ( dialog == IM_SESSION_GROUP_START )
|
||||
@@ -282,7 +282,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
|
||||
const LLUUID& session_id,
|
||||
const LLUUID& other_participant_id,
|
||||
const EInstantMessage& dialog,
|
||||
const std::vector<LLUUID>& ids) :
|
||||
const uuid_vec_t& ids) :
|
||||
LLFloater(log_label, LLRect(), log_label),
|
||||
mStartCallOnInitialize(false),
|
||||
mInputEditor(NULL),
|
||||
@@ -703,7 +703,7 @@ private:
|
||||
LLUUID mSessionID;
|
||||
};
|
||||
|
||||
bool LLFloaterIMPanel::inviteToSession(const std::vector<LLUUID>& ids)
|
||||
bool LLFloaterIMPanel::inviteToSession(const uuid_vec_t& ids)
|
||||
{
|
||||
LLViewerRegion* region = gAgent.getRegion();
|
||||
if (!region)
|
||||
@@ -951,9 +951,7 @@ BOOL LLFloaterIMPanel::dropCallingCard(LLInventoryItem* item, BOOL drop)
|
||||
{
|
||||
if (drop)
|
||||
{
|
||||
std::vector<LLUUID> ids;
|
||||
ids.push_back(item->getCreatorUUID());
|
||||
inviteToSession(ids);
|
||||
inviteToSession({ item->getCreatorUUID() });
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -980,7 +978,7 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop)
|
||||
}
|
||||
else if(drop)
|
||||
{
|
||||
std::vector<LLUUID> ids;
|
||||
uuid_vec_t ids;
|
||||
for(S32 i = 0; i < count; ++i)
|
||||
{
|
||||
ids.push_back(items.at(i)->getCreatorUUID());
|
||||
|
||||
Reference in New Issue
Block a user