From fbfe7418e567b79c60cc873a8882d9be97e3bb0a Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sat, 20 Nov 2010 07:25:09 -0500 Subject: Moved Enable Hints to 2nd line of Help menu --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index adfee2cce9..6b56fbfd7c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -356,6 +356,7 @@ Joghert LeSabre Jonathan Yap VWR-17801 STORM-616 + STORM-596 Kage Pixel VWR-11 Ken March -- cgit v1.3 From abf406e3d5f957d66618afaf02f54d0d686bda67 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Tue, 23 Nov 2010 20:55:18 -0500 Subject: STORM-674: corrected duplicate name tags in pannel_preferences_color.xml --- doc/contributions.txt | 6 +++--- indra/newview/skins/default/xui/en/panel_preferences_colors.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index adfee2cce9..d4e459039d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -768,16 +768,16 @@ WolfPup Lowenhar STORM-102 STORM-103 STORM-143 + STORM-255 + STORM-256 STORM-535 STORM-544 STORM-654 + STORM-674 VWR-20741 VWR-20933 Zai Lynch VWR-19505 -Wolfpup Lowenhar - STORM-255 - STORM-256 Zarkonnen Decosta VWR-253 Zi Ree diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 6dc419a96c..0c75399764 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -317,7 +317,7 @@ layout="topleft" left="30" height="12" - name="bubble_chat" + name="floater_opacity" top_pad="15" width="120" > @@ -355,7 +355,7 @@ left="50" max_val="1.00" min_val="0.00" - name="active" + name="inactive" show_text="true" top_pad="5" width="415" /> -- cgit v1.3 From 732b1f748eb1844eb97ab2293ebc3b1bebb0c9e7 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 25 Nov 2010 13:45:05 -0500 Subject: Forgot to give myself credit. --- doc/contributions.txt | 1 + indra/llinventory/llinventorydefines.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index d4e459039d..94c9ba709f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -356,6 +356,7 @@ Joghert LeSabre Jonathan Yap VWR-17801 STORM-616 + STORM-679 Kage Pixel VWR-11 Ken March diff --git a/indra/llinventory/llinventorydefines.cpp b/indra/llinventory/llinventorydefines.cpp index c2b035f7cf..575331a263 100644 --- a/indra/llinventory/llinventorydefines.cpp +++ b/indra/llinventory/llinventorydefines.cpp @@ -28,4 +28,4 @@ #include "llinventorydefines.h" const U8 TASK_INVENTORY_ITEM_KEY = 0; -const U8 TASK_INVENTORY_ASSET_KEY = 1; \ No newline at end of file +const U8 TASK_INVENTORY_ASSET_KEY = 1; -- cgit v1.3