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

Move ScriptQuestion strings from floater_chat_history.xml to strings.xml

Browse Source
This commit is contained in:
Lirusaito
2013-07-17 11:56:02 -04:00
parent ede1282307
commit a1d9473fde
10 changed files with 27 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewermessage.cpp
View File

@@ -6740,9 +6740,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
perms.append(", ");
}
LLStringUtil::format_map_t args;
args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
perms.append(LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args));
perms.append(LLTrans::getString(SCRIPT_QUESTIONS[i]));
}
}
@@ -6918,14 +6916,11 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
{
if (questions & LSCRIPTRunTimePermissionBits[i])
{
LLStringUtil::format_map_t args;
args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
count++;
script_question += " " + LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args) + "\n";
// check whether permission question should cause special caution dialog
caution |= (SCRIPT_QUESTION_IS_CAUTION[i]);
script_question += " " + LLTrans::getString(SCRIPT_QUESTIONS[i]) + "\n";
}
}
args["QUESTIONS"] = script_question;