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

Update lsl stuffs (Adds support for all the new stuff we'd fallen behind on)

Browse Source
This commit is contained in:
Lirusaito
2013-07-17 12:59:01 -04:00
parent a1d9473fde
commit 2b7c70d765
9 changed files with 252 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llviewermessage.cpp
View File

@@ -187,7 +187,10 @@ const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
"TrackYourCamera",
"ControlYourCamera",
"TeleportYourAgent",
"OverrideAnimations"
"JoinAnExperience",
"SilentlyManageEstateAccess",
"OverrideYourAnimations",
"ScriptReturnObjects"
};
const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
@@ -204,7 +207,10 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
FALSE, // TrackYourCamera,
FALSE, // ControlYourCamera
FALSE, // TeleportYourAgent
FALSE // OverrideAnimations
FALSE, // JoinAnExperience
FALSE, // SilentlyManageEstateAccess
FALSE, // OverrideYourAnimations
FALSE, // ScriptReturnObjects
};
bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
@@ -259,11 +265,6 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
static LLNotificationFunctorRegistration friendship_offer_callback_reg("OfferFriendship", friendship_offer_callback);
static LLNotificationFunctorRegistration friendship_offer_callback_reg_nm("OfferFriendshipNoMessage", friendship_offer_callback);
//const char BUSY_AUTO_RESPONSE[] = "The Resident you messaged is in 'busy mode' which means they have "
// "requested not to be disturbed. Your message will still be shown in their IM "
// "panel for later viewing.";
//
// Functions
//
@@ -6674,7 +6675,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
// located in [REGIONNAME] at [REGIONPOS],
// has been <granted|denied> permission to: [PERMISSIONS]."
LLUIString notice(LLFloaterChat::getInstance()->getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
LLUIString notice(LLTrans::getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
// always include the object name and owner name
notice.setArg("[OBJECTNAME]", notification["payload"]["object_name"].asString());