EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release

** This should be the last merge from branches/maintenance.  All future merges will be from new maintenance-# branches off release **

ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa

6 files changed, 45 insertions, 13 deletions

diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index ac967c4853..f720fc0ec1 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -84,7 +84,30 @@ export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-
 export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'
 export SL_OPT="`cat gridargs.dat` $@"
 
-eval ${SL_ENV} ${SL_CMD} ${SL_OPT} || echo Unclean shutdown.
+# Run the program
+eval ${SL_ENV} ${SL_CMD} ${SL_OPT} || LL_RUN_ERR=runerr
+
+# Handle any resulting errors
+if [ -n "$LL_RUN_ERR" ]; then
+	LL_RUN_ERR_MSG=""
+	if [ "$LL_RUN_ERR" = "runerr" ]; then
+		# generic error running the binary
+		echo '*** Unclean shutdown. ***'
+		if [ "`arch`" = "x86_64" ]; then
+			echo
+			cat << EOFMARKER
+You are running the Second Life Viewer on a x86_64 platform.  The
+most common problems when launching the Viewer (particularly
+'bin/do-not-directly-run-secondlife-bin: not found' and 'error while
+loading shared libraries') may be solved by installing your Linux
+distribution's 32-bit compatibility packages.
+For example, on Ubuntu and other Debian-based Linuxes you might run:
+$ sudo apt-get install ia32-libs ia32-libs-gtk ia32-libs-kde ia32-libs-sdl
+EOFMARKER
+		fi
+	fi
+fi
+	
 
 echo
 echo '*********************************************************'
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index ead985a992..a37044f364 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -306,7 +306,7 @@ LLUUID LLInventoryModel::findCatUUID(LLAssetType::EType preferred_type)
 }
 
 // Convenience function to create a new category. You could call
-// updateCatgory() with a newly generated UUID category, but this
+// updateCategory() with a newly generated UUID category, but this
 // version will take care of details like what the name should be
 // based on preferred type. Returns the UUID of the new category.
 LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index a2cc0f5a81..844afca629 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -495,7 +495,6 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
 	gAgent.setUserGroupFlags(mGroupID, receive_notices, list_in_profile);
 
 	mChanged = FALSE;
-	notifyObservers();
 
 	return true;
 }
@@ -810,6 +809,7 @@ void LLPanelGroupGeneral::updateChanged()
 		mSpinEnrollmentFee,
 		mCtrlReceiveNotices,
 		mCtrlListGroup,
+		mActiveTitleLabel,
 		mComboActiveTitle
 	};
 
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 0fbcd93b0b..5fbe3f0c8e 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -4783,19 +4783,17 @@ void LLSelectMgr::updateSilhouettes()
 			 iter != roots.end(); iter++)
 		{
 			LLViewerObject* objectp = *iter;
-			LLSelectNode* rect_select_node = new LLSelectNode(objectp, TRUE);
-			rect_select_node->selectAllTEs(TRUE);
+			LLSelectNode* rect_select_root_node = new LLSelectNode(objectp, TRUE);
+			rect_select_root_node->selectAllTEs(TRUE);
 
 			if (!canSelectObject(objectp))
 			{
 				continue;
 			}
 
-			mHighlightedObjects->addNode(rect_select_node);
-
 			if (!select_linked_set)
 			{
-				rect_select_node->mIndividualSelection = TRUE;
+				rect_select_root_node->mIndividualSelection = TRUE;
 			}
 			else
 			{
@@ -4808,11 +4806,14 @@ void LLSelectMgr::updateSilhouettes()
 						continue;
 					}
 
-					rect_select_node = new LLSelectNode(objectp->mChildList[i], TRUE);
+					LLSelectNode* rect_select_node = new LLSelectNode(objectp->mChildList[i], TRUE);
 					rect_select_node->selectAllTEs(TRUE);
-					mHighlightedObjects->addNode(rect_select_node);
+					mHighlightedObjects->addNodeAtEnd(rect_select_node);
 				}
 			}
+
+			// Add the root last, to preserve order for link operations.
+			mHighlightedObjects->addNodeAtEnd(rect_select_root_node);
 		}
 
 		num_sils_genned	= 0;
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index cdfc6c2ebf..d5abfbdab6 100644
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -262,9 +262,11 @@ BOOL LLToolCamera::handleMouseUp(S32 x, S32 y, MASK mask)
 			{
 				LLCoordGL mouse_pos;
 				LLVector3 focus_pos = gAgent.getPosAgentFromGlobal(gAgent.getFocusGlobal());
-				gCamera->projectPosAgentToScreen(focus_pos, mouse_pos);
-
-				LLUI::setCursorPositionScreen(mouse_pos.mX, mouse_pos.mY);
+				BOOL success = gCamera->projectPosAgentToScreen(focus_pos, mouse_pos);
+				if (success)
+				{
+					LLUI::setCursorPositionScreen(mouse_pos.mX, mouse_pos.mY);
+				}
 			}
 			else if (mMouseSteering)
 			{
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 6b38bd1765..2078bd47f5 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -140,6 +140,11 @@ class WindowsManifest(ViewerManifest):
                 # For using FMOD for sound... DJS
                 self.path("fmod.dll")
 
+                # For textures
+                if self.prefix(src="../../libraries/i686-win32/lib_release", dst=""):
+                        self.path("openjpeg.dll")
+                        self.end_prefix()
+
                 # Mozilla appears to force a dependency on these files so we need to ship it (CP)
                 self.path("msvcr71.dll")
                 self.path("msvcp71.dll")
@@ -482,6 +487,7 @@ class Linux_i686Manifest(LinuxManifest):
                         self.path("libuuid.so", "libuuid.so.1")
                         self.path("libSDL-1.2.so.0")
                         self.path("libELFIO.so")
+                        self.path("libopenjpeg.so.2")
                         #self.path("libtcmalloc.so.0") - bugged
                         #self.path("libstacktrace.so.0") - probably bugged
                         self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason