From fbfe7418e567b79c60cc873a8882d9be97e3bb0a Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
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 732b1f748eb1844eb97ab2293ebc3b1bebb0c9e7 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
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


From 50b6114862ee105b084975bcc8c455f0a1d411d8 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 3 Dec 2010 07:30:19 -0500
Subject: Tiny change to panel_login.xml so Start Location preferences work
 under all circumstances

---
 doc/contributions.txt                              | 1 +
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index d4e459039d..c88d712bc8 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -356,6 +356,7 @@ Joghert LeSabre
 Jonathan Yap
 	VWR-17801
 	STORM-616
+	STORM-726
 Kage Pixel
 	VWR-11
 Ken March
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index b181ca3bba..89feba7c3c 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -127,7 +127,7 @@ top="20"
  </text>
 <combo_box
 allow_text_entry="true"
-control_name="LoginLocation"
+control_name="NextLoginLocation"
   follows="left|bottom"
   height="23"
 max_chars="128"
-- 
cgit v1.3