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

[XP Tools] Further UI beautification

Browse Source 
Refix all the panels that weren't good enough.
Fix settingss and default rects
Remove unused
Fix toolbar prefs floater
Use text editors for "URLs" we can't control, they resolve nicer anyway
Fix Texture Ctrl on profile not popping out on click
Fix Maturity string on profile not displaying
Also update about floater credits according to modern data.
This commit is contained in:
Liru Færs
2020-02-07 07:22:48 -05:00
parent 36b75b2398
commit 49f0f8e28f
16 changed files with 185 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llviewermessage.cpp
View File

@@ -7204,17 +7204,6 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
void script_question_mute(const LLUUID& item_id, const std::string& object_name);
bool unknown_script_question_cb(const LLSD& notification, const LLSD& response)
{
// Only care if they muted the object here.
if ( response["Mute"] ) // mute
{
LLUUID task_id = notification["payload"]["task_id"].asUUID();
script_question_mute(task_id,notification["payload"]["object_name"].asString());
}
return false;
}
void experiencePermissionBlock(LLUUID experience, LLSD result)
{
LLSD permission;
@@ -7332,8 +7321,7 @@ void script_question_mute(const LLUUID& task_id, const std::string& object_name)
bool matches(const LLNotificationPtr notification) const override
{
if (notification->getName() == "ScriptQuestionCaution"
|| notification->getName() == "ScriptQuestion"
|| notification->getName() == "UnknownScriptQuestion")
|| notification->getName() == "ScriptQuestion")
{
return (notification->getPayload()["task_id"].asUUID() == blocked_id);
}
@@ -7351,7 +7339,6 @@ void script_question_mute(const LLUUID& task_id, const std::string& object_name)
static LLNotificationFunctorRegistration script_question_cb_reg_1("ScriptQuestion", script_question_cb);
static LLNotificationFunctorRegistration script_question_cb_reg_2("ScriptQuestionCaution", script_question_cb);
static LLNotificationFunctorRegistration script_question_cb_reg_3("ScriptQuestionExperience", script_question_cb);
static LLNotificationFunctorRegistration unknown_script_question_cb_reg("UnknownScriptQuestion", unknown_script_question_cb);
void process_script_experience_details(const LLSD& experience_details, LLSD args, LLSD payload)
{
@@ -7475,14 +7462,12 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
args["QUESTIONS"] = script_question;
if (known_questions != questions)
{ // This is in addition to the normal dialog.
LLSD payload;
payload["task_id"] = taskid;
payload["item_id"] = itemid;
payload["object_name"] = object_name;
args["DOWNLOADURL"] = LLTrans::getString("ViewerDownloadURL");
LLNotificationsUtil::add("UnknownScriptQuestion", args, payload);
{
// This is in addition to the normal dialog.
// Viewer got a request for not supported/implemented permission
LL_WARNS("Messaging") << "Object \"" << object_name << "\" requested " << script_question
<< " permission. Permission is unknown and can't be granted. Item id: " << itemid
<< " taskid:" << taskid << LL_ENDL;
}
if (known_questions)