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

Merge branch 'master' of git://github.com/siana/SingularityViewer

Browse Source 
Conflicts:
	indra/llrender/llvertexbuffer.cpp
Also, reverts indra/newview/skins/default/xui/en-us/panel_audio.xml to before mute-gesture button (For now can be toggled through SinguMuteGestures debug setting)
This commit is contained in:
Lirusaito
2012-03-27 07:15:48 -04:00
parent d9cbd52ea8 caaba76921
commit af67342969
156 changed files with 1501 additions and 1181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llviewermessage.cpp
View File

@@ -5787,6 +5787,16 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
S32 orig = notification["payload"]["questions"].asInteger();
S32 new_questions = orig;
if (response["Details"])
{
// respawn notification...
LLNotificationsUtil::add(notification["name"], notification["substitutions"], notification["payload"]);
// ...with description on top
LLNotificationsUtil::add("DebitPermissionDetails");
return false;
}
// check whether permissions were granted or denied
BOOL allowed = TRUE;
// the "yes/accept" button is the first button in the template, making it button 0
@@ -5843,14 +5853,6 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
gNotifyBoxView->purgeMessagesMatching(OfferMatcher(item_id));
}
if (response["Details"])
{
// respawn notification...
LLNotifications::instance().add(notification["name"], notification["substitutions"], notification["payload"]);
// ...with description on top
LLNotificationsUtil::add("DebitPermissionDetails");
}
return false;
}
static LLNotificationFunctorRegistration script_question_cb_reg_1("ScriptQuestion", script_question_cb);