livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-2100 Incorrect displays in Script Information window

meow-7.2.2
Jonathan Yap 2015-01-06 10:49:02 -05:00
parent 9f88029ca6
commit aeb64da07a
6 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -753,6 +753,7 @@ Jonathan Yap
STORM-2099
STORM-2091
STORM-2092
STORM-2100
Kadah Coba
STORM-1060
STORM-1843

27
indra/newview/llfloaterscriptlimits.cpp
View File

@ -523,6 +523,8 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content)
LLScrollListCell::Params cell_params;
cell_params.font = LLFontGL::getFontSansSerif();
// Start out right justifying numeric displays
cell_params.font_halign = LLFontGL::RIGHT;
cell_params.column = "size";
cell_params.value = size;
@ -532,6 +534,8 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content)
cell_params.value = urls;
item_params.columns.add(cell_params);
cell_params.font_halign = LLFontGL::LEFT;
// The rest of the columns are text to left justify them
cell_params.column = "name";
cell_params.value = name_buf;
item_params.columns.add(cell_params);
@ -546,7 +550,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content)
cell_params.column = "location";
cell_params.value = has_locations
? llformat("<%0.1f,%0.1f,%0.1f>", location_x, location_y, location_z)
? llformat("<%0.0f, %0.0f, %0.0f>", location_x, location_y, location_z)
: "";
item_params.columns.add(cell_params);
@ -623,13 +627,24 @@ void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content)
if((mParcelMemoryUsed >= 0) && (mParcelMemoryMax >= 0))
{
S32 parcel_memory_available = mParcelMemoryMax - mParcelMemoryUsed;
LLStringUtil::format_map_t args_parcel_memory;
args_parcel_memory["[COUNT]"] = llformat ("%d", mParcelMemoryUsed);
args_parcel_memory["[MAX]"] = llformat ("%d", mParcelMemoryMax);
args_parcel_memory["[AVAILABLE]"] = llformat ("%d", parcel_memory_available);
std::string msg_parcel_memory = LLTrans::getString("ScriptLimitsMemoryUsed", args_parcel_memory);
std::string translate_message;
if (0 < mParcelMemoryMax)
{
S32 parcel_memory_available = mParcelMemoryMax - mParcelMemoryUsed;
args_parcel_memory["[MAX]"] = llformat ("%d", mParcelMemoryMax);
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));
}

3
indra/newview/skins/default/xui/en/floater_script_limits.xml
View File

@ -8,7 +8,8 @@
name="scriptlimits"
save_rect="true"
title="SCRIPT INFORMATION"
width="480">
min_width="620"
width="620">
<tab_container
bottom="555"
follows="left|right|top|bottom"

12
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -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">
@ -448,7 +448,7 @@
parameter="mini_map" />
</menu_item_check>
<menu_item_check
label="Search"
label="Search..."
name="Search"
shortcut="control|F">
<menu_item_check.on_check
@ -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"

12
indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
View File

@ -8,7 +8,7 @@
left="0"
name="script_limits_my_avatar_panel"
top="0"
width="480">
width="620">
<text
type="string"
length="1"
@ -19,7 +19,7 @@
name="script_memory"
top_pad="24"
text_color="White"
width="480">
width="620">
Avatar Script Usage
</text>
<text
@ -31,7 +31,7 @@
left="30"
name="memory_used"
top_delta="18"
width="480">
width="620">
</text>
<text
@ -43,7 +43,7 @@
left="30"
name="urls_used"
top_delta="18"
width="480">
width="620">
</text>
<text
@ -56,7 +56,7 @@
name="loading_text"
top="80"
text_color="EmphasisColor"
width="480">
width="620">
Loading...
</text>
<scroll_list
@ -68,7 +68,7 @@
multi_select="true"
name="scripts_list"
top="100"
width="460">
width="600">
<scroll_list.columns
label="Size (kb)"
name="size"

40
indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
View File

@ -8,7 +8,7 @@
name="script_limits_region_memory_panel"
top="0"
left="0"
width="480">
width="620">
<text
type="string"
length="1"
@ -19,7 +19,7 @@
name="script_memory"
top_pad="24"
text_color="White"
width="480">
width="620">
Parcel Script Memory
</text>
<text
@ -32,7 +32,7 @@
name="parcels_listed"
top_delta="18"
visible="true"
width="480">
width="620">
</text>
<text
@ -44,7 +44,7 @@
left="30"
name="memory_used"
top_delta="18"
width="480">
width="620">
</text>
<text
@ -56,7 +56,7 @@
left="30"
name="urls_used"
top_delta="18"
width="480">
width="620">
</text>
<text
@ -69,7 +69,7 @@
name="loading_text"
top_delta="12"
text_color="EmphasisColor"
width="480">
width="620">
Loading...
</text>
<scroll_list
@ -83,7 +83,7 @@
sort_ascending="true"
name="scripts_list"
top_delta="16"
width="460">
width="600">
<scroll_list.columns
label="Size (kb)"
name="size"
@ -120,23 +120,23 @@
left="10"
width="100" />
<button
follows="bottom|right"
height="19"
label="Highlight"
visible="false"
layout="bottomright"
left="370"
name="highlight_btn"
top="34"
width="100" />
<button
follows="bottom|right"
follows="bottom|left"
height="19"
label="Return"
visible="false"
layout="bottomright"
layout="bottomleft"
name="return_btn"
top="34"
left_delta="-105"
left_delta="390"
width="100" />
<button
follows="bottom|left"
height="19"
label="Highlight"
visible="false"
layout="bottomleft"
left_delta="105"
name="highlight_btn"
top="34"
width="100" />
</panel>