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

Merge remote-tracking branch 'shyotl/sunshine'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-21 11:25:10 +01:00
parent 4cd2de0fff dc106c5442
commit 18816ae146
415 changed files with 20229 additions and 16924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llviewermessage.cpp
View File

@@ -678,7 +678,6 @@ void send_sound_trigger(const LLUUID& sound_id, F32 gain)
bool join_group_response(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
BOOL delete_context_data = TRUE;
bool accept_invite = false;
LLUUID group_id = notification["payload"]["group_id"].asUUID();
@@ -707,7 +706,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
}
else
{
delete_context_data = FALSE;
LLSD args;
args["NAME"] = name;
args["INVITE"] = message;
@@ -721,7 +719,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
// sure the user is sure they want to join.
if (fee > 0)
{
delete_context_data = FALSE;
LLSD args;
args["COST"] = llformat("%d", fee);
// Set the fee for next time to 0, so that we don't keep
@@ -5216,9 +5213,19 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
// Various hacks that aren't statistics, but are being handled here.
//
U32 max_tasks_per_region;
U32 region_flags;
U64 region_flags;
msg->getU32("Region", "ObjectCapacity", max_tasks_per_region);
msg->getU32("Region", "RegionFlags", region_flags);
if (msg->has(_PREHASH_RegionInfo))
{
msg->getU64("RegionInfo", "RegionFlagsExtended", region_flags);
}
else
{
U32 flags = 0;
msg->getU32("Region", "RegionFlags", flags);
region_flags = flags;
}
LLViewerRegion* regionp = gAgent.getRegion();
if (regionp)