From 759eed5ef6be191fff2b19a9fe6064d089ec076b Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 7 Feb 2011 11:53:08 -0500
Subject: STORM-974 forgot to edit contributions.txt

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8765240caa..3a2070409e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -390,6 +390,7 @@ Jonathan Yap
 	STORM-869
 	VWR-17801
 	VWR-24347
+	STORM-974
 Kage Pixel
 	VWR-11
 Ken March
-- 
cgit v1.3


From 333a9b3f978d6b6485b1c760fd177bdcfea7d2fc Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 9 Feb 2011 10:52:12 -0500
Subject: STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF
 has been used

---
 doc/contributions.txt                       | 1 +
 indra/test_apps/llplugintest/CMakeLists.txt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8765240caa..143a0f6dc0 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -390,6 +390,7 @@ Jonathan Yap
 	STORM-869
 	VWR-17801
 	VWR-24347
+	STORM-977
 Kage Pixel
 	VWR-11
 Ken March
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index b4043b0fd9..cf97135d88 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # -*- cmake -*-
-
+if(LL_TESTS)
 project(llplugintest)
 
 include(00-Common)
@@ -537,3 +537,4 @@ if(WINDOWS)
 endif(WINDOWS)
 
 ll_deploy_sharedlibs_command(llmediaplugintest) 
+endif(LL_TESTS)
-- 
cgit v1.3


From 06c1fede783ef3d9279411547e34c5d23c28fed7 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 10 Feb 2011 15:22:36 -0500
Subject: STORM-979 selection outline from inventory bottom panel buttons is
 cut at the left side when clicked.

---
 doc/contributions.txt                              |  1 +
 .../skins/default/xui/en/sidepanel_inventory.xml   | 36 +++++++++++-----------
 2 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 516760aa5a..75890e0bd4 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -398,6 +398,7 @@ Jonathan Yap
 	STORM-643
 	STORM-960
 	STORM-953
+	STORM-979
 Kage Pixel
 	VWR-11
 Ken March
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index f3c6895cee..8997c1a6d7 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -37,7 +37,7 @@
 			 name="button_panel"
 			 left="9"
 			 top_pad="-2"
-			 width="313">
+			 width="308">
 			<layout_stack
      	         follows="bottom|left|right"
 		         height="23"
@@ -47,7 +47,7 @@
 		         left="0"
 		         orientation="horizontal"
 		         top="0"
-		         width="313">	
+		         width="308">	
 			    <layout_panel
 			         follows="bottom|left|right"
 			         height="23"
@@ -57,7 +57,7 @@
                      name="info_btn_lp"
                      user_resize="false" 
                      auto_resize="true"
-                     width="103">
+                     width="101">
                     <button
                          enabled="true"
                          follows="bottom|left|right"
@@ -68,62 +68,62 @@
                          name="info_btn"
                          tool_tip="Show object profile"
                          top="0"
-                         width="102" />
+                         width="100" />
 			    </layout_panel>
 			    <layout_panel
                      follows="bottom|left|right"
                      height="23"
                      layout="bottomleft"
-                     left_pad="3"			
+                     left_pad="1"			
                      mouse_opaque="false"
                      name="share_btn_lp"
                      user_resize="false" 
                      auto_resize="true"
-                     width="102">
+                     width="100">
                     <button
                          enabled="true"
                          follows="bottom|left|right"
                          height="23"
                          label="Share"
                          layout="topleft"
-                         left="0"
+                         left="1"
                          name="share_btn"
                          tool_tip="Share an inventory item"
                          top="0"
-                         width="102" />
+                         width="99" />
 			    </layout_panel>
 			    <layout_panel
                      follows="bottom|left|right"
                      height="23"
                      layout="bottomleft"
-                     left_pad="3"			
+                     left_pad="1"			
                      mouse_opaque="false"
                      name="shop_btn_lp"
                      user_resize="false" 
                      auto_resize="true"
-                     width="102">
+                     width="100">
                     <button
                          enabled="true"
                          follows="bottom|left|right"
                          height="23"
                          label="Shop"
                          layout="topleft"
-                         left="0"
+                         left="1"
                          name="shop_btn"
                          tool_tip="Open Marketplace webpage"
                          top="0"
-                         width="102" />
+                         width="99" />
                     <button
                          enabled="false"
                          follows="bottom|left|right"
                          height="23"
                          label="Wear"
                          layout="topleft"
-                         left="0"
+                         left="1"
                          name="wear_btn"
                          tool_tip="Wear seleceted outfit"
                          top="0"
-                         width="102" />
+                         width="99" />
                     <button
                          enabled="false"
                          follows="bottom|left|right"
@@ -131,20 +131,20 @@
                          label="Play"
                          layout="topleft"
                          name="play_btn"
-                         left="0"
+                         left="1"
                          top="0"
-                         width="102" />
+                         width="99" />
                     <button
                          enabled="false"
                          follows="bottom|left|right"
                          height="23"
                          label="Teleport"
                          layout="topleft"
-                         left="0"
+                         left="1"
                          name="teleport_btn"
                          tool_tip="Teleport to the selected area"
                          top="0"
-                         width="102" />
+                         width="99" />
 			    </layout_panel>
 			</layout_stack>
 		</panel>
-- 
cgit v1.3


From 29b3207fe433497c60feff0b1f71b7fdb27412e1 Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Fri, 11 Feb 2011 01:27:01 +0100
Subject: OPEN-29 Error out if lldir_<platform>.h is included when building for
 a different platform

As far as I know, there is no good reason to include e.g.
indra/llvfs/lldir_win32.h while not building for a windows target, so be
better prevent this to avoid hard to find errors.
---
 doc/contributions.txt       | 1 +
 indra/llvfs/lldir_linux.h   | 4 ++++
 indra/llvfs/lldir_mac.h     | 4 ++++
 indra/llvfs/lldir_solaris.h | 4 ++++
 indra/llvfs/lldir_win32.h   | 4 ++++
 5 files changed, 17 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 516760aa5a..3330b9794f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -189,6 +189,7 @@ Blakar Ogre
 blino Nakamura
 	VWR-17
 Boroondas Gupte
+	OPEN-29
 	SNOW-278
 	SNOW-503
 	SNOW-510
diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h
index 451e81ae93..c7cfe905f5 100644
--- a/indra/llvfs/lldir_linux.h
+++ b/indra/llvfs/lldir_linux.h
@@ -24,6 +24,10 @@
  * $/LicenseInfo$
  */
 
+#if !LL_LINUX
+#error This header must not be included when compiling for any target other than Linux. Consider including lldir.h instead.
+#endif // !LL_LINUX
+
 #ifndef LL_LLDIR_LINUX_H
 #define LL_LLDIR_LINUX_H
 
diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h
index 4eac3c3ae6..6bde458bf6 100644
--- a/indra/llvfs/lldir_mac.h
+++ b/indra/llvfs/lldir_mac.h
@@ -24,6 +24,10 @@
  * $/LicenseInfo$
  */
 
+#if !LL_DARWIN
+#error This header must not be included when compiling for any target other than Mac OS. Consider including lldir.h instead.
+#endif // !LL_DARWIN
+
 #ifndef LL_LLDIR_MAC_H
 #define LL_LLDIR_MAC_H
 
diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h
index 4a1794f539..b48752d362 100644
--- a/indra/llvfs/lldir_solaris.h
+++ b/indra/llvfs/lldir_solaris.h
@@ -24,6 +24,10 @@
  * $/LicenseInfo$
  */
 
+#if !LL_SOLARIS
+#error This header must not be included when compiling for any target other than Solaris. Consider including lldir.h instead.
+#endif // !LL_SOLARIS
+
 #ifndef LL_LLDIR_SOLARIS_H
 #define LL_LLDIR_SOLARIS_H
 
diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h
index 4c932c932c..1d0a692883 100644
--- a/indra/llvfs/lldir_win32.h
+++ b/indra/llvfs/lldir_win32.h
@@ -24,6 +24,10 @@
  * $/LicenseInfo$
  */
 
+#if !LL_WINDOWS
+#error This header must not be included when compiling for any target other than Windows. Consider including lldir.h instead.
+#endif // !LL_WINDOWS
+
 #ifndef LL_LLDIR_WIN32_H
 #define LL_LLDIR_WIN32_H
 
-- 
cgit v1.3


From 355d6d1f79ec695d5cb310ec68d5d6252a9645c2 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 11 Feb 2011 05:17:05 -0500
Subject: STORM-980 Appearance panel / Wear button is too wide

---
 doc/contributions.txt                                          | 1 +
 indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 516760aa5a..5c0afd0507 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -398,6 +398,7 @@ Jonathan Yap
 	STORM-643
 	STORM-960
 	STORM-953
+	STORM-980
 Kage Pixel
 	VWR-11
 Ken March
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 88c82313dd..26efe783f8 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -76,7 +76,7 @@
 		         left="0"
 		         orientation="horizontal"
 		         top="0"
-		         width="313">	
+		         width="308">	
 			    <layout_panel
 			         follows="bottom|left|right"
 			         height="23"
@@ -120,7 +120,7 @@
                      name="wear_btn_lp"
                      user_resize="false" 
                      auto_resize="true"
-                     width="152">
+                     width="147">
                     <button
                          follows="bottom|left|right"
                          height="23"
@@ -129,7 +129,7 @@
                          name="wear_btn"
                          left="0"
                          top="0"
-                         width="152" />
+                         width="147" />
 			    </layout_panel>
 			</layout_stack>
    </panel>
-- 
cgit v1.3


From e3f075f77560323e6fb812ca2058d07ccb506044 Mon Sep 17 00:00:00 2001
From: Twisted Laws <none@none>
Date: Tue, 15 Feb 2011 14:13:43 -0500
Subject: STORM-954 SL-viewer 2.0 No nearby people when over approxiamately
 1000 meters

---
 doc/contributions.txt     |  2 ++
 indra/newview/llworld.cpp | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index e1fb234f05..3d8cd1d685 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -395,6 +395,7 @@ Jonathan Yap
 	VWR-17801
 	VWR-24347
 	STORM-975
+	STORM-954
 Kage Pixel
 	VWR-11
 Ken March
@@ -781,6 +782,7 @@ Twisted Laws
 	STORM-467
 	STORM-844
 	STORM-643
+	STORM-954
 Vadim Bigbear
 	VWR-2681
 Vector Hastings
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 9db6d5e08c..481148ba4e 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1474,6 +1474,42 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
 			}
 		}
 	}
+	// retrieve the list of close avatars from viewer objects as well
+	// for when we are above 1000m, only do this when we are retrieving
+	// uuid's too as there could be duplicates
+	if(avatar_ids != NULL)
+	{
+		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+			iter != LLCharacter::sInstances.end(); ++iter)
+		{
+			LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter;
+			if(pVOAvatar->isDead() || pVOAvatar->isSelf())
+				continue;
+			LLUUID uuid = pVOAvatar->getID();
+			if(uuid.isNull())
+				continue;
+			LLVector3d pos_global = pVOAvatar->getPositionGlobal();
+			if(dist_vec(pos_global, relative_to) <= radius)
+			{
+				bool found = false;
+				uuid_vec_t::iterator sel_iter = avatar_ids->begin();
+				for (; sel_iter != avatar_ids->end(); sel_iter++)
+				{
+					if(*sel_iter == uuid)
+					{
+						found = true;
+						break;
+					}
+				}
+				if(!found)
+				{
+					if(positions != NULL)
+						positions->push_back(pos_global);
+					avatar_ids->push_back(uuid);
+				}
+			}
+		}
+	}
 }
 
 
-- 
cgit v1.3