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

Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 18:27:21 -05:00
parent 1c627317ec
commit 09f4528bfb
122 changed files with 883 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewermessage.cpp
View File

@@ -4389,15 +4389,15 @@ public:
is_card);
}
LLSD args;
if ( land_items.count() > 0 )
if ( land_items.size() > 0 )
{ // Show notification that they can now teleport to landmarks. Use a random landmark from the inventory
S32 random_land = ll_rand( land_items.count() - 1 );
S32 random_land = ll_rand(land_items.size() - 1);
args["NAME"] = land_items[random_land]->getName();
LLNotificationsUtil::add("TeleportToLandmark",args);
}
if ( card_items.count() > 0 )
if ( card_items.size() > 0 )
{ // Show notification that they can now contact people. Use a random calling card from the inventory
S32 random_card = ll_rand( card_items.count() - 1 );
S32 random_card = ll_rand(card_items.size() - 1);
args["NAME"] = card_items[random_card]->getName();
LLNotificationsUtil::add("TeleportToPerson",args);
}
@@ -7835,7 +7835,7 @@ bool handle_lure_callback(const LLSD& notification, const LLSD& response)
void handle_lure(const LLUUID& invitee)
{
LLDynamicArray<LLUUID> ids;
std::vector<LLUUID> ids;
ids.push_back(invitee);
handle_lure(ids);
}