From f4ff1430f0d6ae7dd5a6be0bd665678b30a63aca Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Fri, 3 Dec 2010 22:16:16 -0700
Subject: first iteration of memory pool code
---
indra/newview/skins/default/xui/en/notifications.xml | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dfbb408d96..5183788c98 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6450,6 +6450,20 @@ Mute everyone?
Here's your current balance of L$. Click Buy L$ to purchase more Linden Dollars.
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="LowMemory"
+ type="alertmodal">
+ Your memory pool is low. Some functions of SL are disabled to avoid crash. Please close other applications. Restart SL if this persists.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ForceQuitDueToLowMemory"
+ type="alertmodal">
+ SL will quit in 30 seconds due to out of memory.
+ </notification>
+
<notification
name="PopupAttempt"
icon="Popup_Caution"
@@ -6504,4 +6518,4 @@ Otherwise, you can look at the Map and find places marked "Infohub".
You died and have been teleported to your home location.
</global>
-</notifications>
+</notifications>
\ No newline at end of file
--
cgit v1.2.3
From 4de6759cd9d566ab92f0d9efa0c0338359dfa85c Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Thu, 6 Jan 2011 16:18:26 -0700
Subject: add debug info to the UI.
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 9a08be2405..1371411656 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1937,6 +1937,16 @@
function="ToggleControl"
parameter="DebugShowColor" />
</menu_item_check>
+ <menu_item_check
+ label="Show Private Mem Info"
+ name="Show Private Mem Info">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="DebugShowPrivateMem" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="DebugShowPrivateMem" />
+ </menu_item_check>
<menu_item_separator/>
--
cgit v1.2.3
From 541e26d947e19cf087e068ab3f1bd46fb1d8fd4f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 23 Aug 2011 07:55:34 -0400
Subject: STORM-1567 Mute button for llDialog popup Updating patch to current
version of viewer-development
---
indra/newview/skins/default/xui/en/notifications.xml | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c9ccd44b83..43e01a1080 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6275,6 +6275,10 @@ Grant this request?
[GROUPNAME]'s '<nolink>[TITLE]</nolink>'
[MESSAGE]
<form name="form">
+ <button
+ index="-2"
+ name="Mute"
+ text="Block"/>
<button
index="-1"
name="Ignore"
--
cgit v1.2.3
From d254c7eb5489df57647d2263162395bcb5fd7c1e Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 24 Aug 2011 18:13:38 -0400
Subject: STORM-1572 XML issues for Basic/Advanced Mode button in menu bar
---
indra/newview/skins/default/xui/en/panel_status_bar.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 23ad0e9528..f25a73da38 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -77,15 +77,16 @@
top="0"
width="55" />
</panel>
+ <!-- UTF 9660 code in label below is a down-pointing filled-in triangle -->
<menu_button
follows="right|top"
image_color="0 0 0 0"
hover_glow_amount="0"
left_pad="5"
- top="0"
+ top="2"
width="55"
height="18"
- label="Mode ▼"
+ label="Mode ▼"
tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
menu_filename="menu_mode_change.xml"
/>
--
cgit v1.2.3
From 1f486a9515d335e0156b23fa84eeb34cdf57cac1 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 26 Aug 2011 12:11:57 -0400
Subject: STORM-1567 Mute button for llDialog popup Made changes per RB
feedback.
---
indra/newview/skins/default/xui/en/notifications.xml | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 43e01a1080..ffc7a2ba55 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6260,6 +6260,10 @@ Grant this request?
[NAME]'s '<nolink>[TITLE]</nolink>'
[MESSAGE]
<form name="form">
+ <button
+ index="-2"
+ name="Mute"
+ text="Block"/>
<button
index="-1"
name="Ignore"
--
cgit v1.2.3
From b918ef5e6fa5f24e5f7e62f50795bce7cb63196c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 26 Aug 2011 15:26:17 -0400
Subject: STORM-1574 Binary data in panel_login.xml -- filled up-pointing
triangle.
---
indra/newview/skins/default/xui/en/panel_login.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 0bc1be666e..83f1bff91f 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -117,12 +117,13 @@ label="Remember password"
name="connect_btn"
top="35"
width="90" />
+ <!-- Utf code in label is a filled up-pointing triangle -->
<menu_button
left_pad="5"
top="35"
width="80"
height="23"
- label="Mode ▲"
+ label="Mode ▲"
name="mode_menu"
tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
menu_filename="menu_mode_change.xml"
--
cgit v1.2.3
From 36f9b513b01a5b3369f3e7c2eb9e3ffe7f6d01a6 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 29 Aug 2011 17:36:37 -0400
Subject: STORM-1522 Region/Estate -> Terrain Text explaining Low and High
values is truncated
---
indra/newview/skins/default/xui/en/panel_region_terrain.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index bbb8b40594..5d060c0a0d 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -193,7 +193,7 @@
</text>
<text
follows="left|top"
- height="20"
+ height="60"
layout="topleft"
left_delta="0"
name="height_text_lbl11"
--
cgit v1.2.3