From be940de86b66c5f66cb17ff6459ca2a6c0bfcf52 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 7 Jan 2015 17:14:51 -0500
Subject: [PATCH] STORM-2100 Remove incorrect "..." from some menu entries
added in the last commit. Right justify numeric columns in the My Avatar tab.
Use the simplified script usage message in the My Avatar tab.
---
indra/newview/llfloaterscriptlimits.cpp | 26 +++++++++++--------
.../skins/default/xui/en/menu_viewer.xml | 10 +++----
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index 56d3a266b13..c14bb4e7ae4 100644
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -629,7 +629,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content)
{
LLStringUtil::format_map_t args_parcel_memory;
args_parcel_memory["[COUNT]"] = llformat ("%d", mParcelMemoryUsed);
- std::string translate_message;
+ std::string translate_message = "ScriptLimitsMemoryUsedSimple";
if (0 < mParcelMemoryMax)
{
@@ -639,10 +639,6 @@ void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content)
args_parcel_memory["[AVAILABLE]"] = llformat ("%d", parcel_memory_available);
translate_message = "ScriptLimitsMemoryUsed";
}
- else
- {
- translate_message = "ScriptLimitsMemoryUsedSimple";
- }
std::string msg_parcel_memory = LLTrans::getString(translate_message, args_parcel_memory);
getChild<LLUICtrl>("memory_used")->setValue(LLSD(msg_parcel_memory));
@@ -1076,10 +1072,12 @@ void LLPanelScriptLimitsAttachment::setAttachmentDetails(LLSD content)
element["columns"][0]["column"] = "size";
element["columns"][0]["value"] = llformat("%d", size);
element["columns"][0]["font"] = "SANSSERIF";
+ element["columns"][0]["halign"] = LLFontGL::RIGHT;
element["columns"][1]["column"] = "urls";
element["columns"][1]["value"] = llformat("%d", urls);
element["columns"][1]["font"] = "SANSSERIF";
+ element["columns"][1]["halign"] = LLFontGL::RIGHT;
element["columns"][2]["column"] = "name";
element["columns"][2]["value"] = name;
@@ -1166,14 +1164,20 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content)
if((mAttachmentMemoryUsed >= 0) && (mAttachmentMemoryMax >= 0))
{
- S32 attachment_memory_available = mAttachmentMemoryMax - mAttachmentMemoryUsed;
-
LLStringUtil::format_map_t args_attachment_memory;
args_attachment_memory["[COUNT]"] = llformat ("%d", mAttachmentMemoryUsed);
- args_attachment_memory["[MAX]"] = llformat ("%d", mAttachmentMemoryMax);
- args_attachment_memory["[AVAILABLE]"] = llformat ("%d", attachment_memory_available);
- std::string msg_attachment_memory = LLTrans::getString("ScriptLimitsMemoryUsed", args_attachment_memory);
- getChild<LLUICtrl>("memory_used")->setValue(LLSD(msg_attachment_memory));
+ std::string translate_message = "ScriptLimitsMemoryUsedSimple";
+
+ if (0 < mAttachmentMemoryMax)
+ {
+ S32 attachment_memory_available = mAttachmentMemoryMax - mAttachmentMemoryUsed;
+
+ args_attachment_memory["[MAX]"] = llformat ("%d", mAttachmentMemoryMax);
+ args_attachment_memory["[AVAILABLE]"] = llformat ("%d", attachment_memory_available);
+ translate_message = "ScriptLimitsMemoryUsed";
+ }
+
+ getChild<LLUICtrl>("memory_used")->setValue(LLTrans::getString(translate_message, args_attachment_memory));
}
if((mAttachmentURLsUsed >= 0) && (mAttachmentURLsMax >= 0))
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c7d97c8ed0d..b34705777cf 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -410,7 +410,7 @@
name="World"
tear_off="true">
<menu_item_call
- label="Landmark This Place..."
+ label="Landmark This Place"
name="Create Landmark Here">
<menu_item_call.on_click
function="World.CreateLandmark" />
@@ -425,7 +425,7 @@
parameter="destinations" />
</menu_item_call>
<menu_item_check
- label="World map..."
+ label="World map"
name="World Map"
shortcut="control|M"
use_mac_ctrl="true">
@@ -487,21 +487,21 @@
</menu_item_call>
<menu_item_separator/>
<menu_item_call
- label="Place profile..."
+ label="Place profile"
layout="topleft"
name="Place Profile">
<menu_item_call.on_click
function="World.PlaceProfile" />
</menu_item_call>
<menu_item_call
- label="About land..."
+ label="About land"
name="About Land">
<menu_item_call.on_click
function="Floater.Show"
parameter="about_land" />
</menu_item_call>
<menu_item_call
- label="Region / Estate..."
+ label="Region / Estate"
name="RegionEstate">
<menu_item_call.on_click
function="Floater.Show"
--
GitLab