From c4b5b3977ffa6669a00f9bc334db02f51cc10fcb Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Sat, 24 Feb 2007 02:23:22 +0000
Subject: [PATCH] svn merge --ignore-ancestry -r 58273:58283
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

The diff is basically a no-op since it's a reverse-merge from release itself. However, several things tried to come along for the ride, so I inspected them carefully:

* Reverted libcurl changes which tried to migrate back from maintenance (see r58322)
* Reverted debugging output in lltooldraganddrop.cpp, which had been added then removed again
* Reverted false-positive binary conflict in libgtk-x11-2.0.so
* Reverted false-positive whitespace (?) conflicts in llmail.cpp, and lldataconnector.cpp
* Left a whitespace change in llselectmgr.cpp so there was something to commit
---
 indra/newview/llselectmgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 078132b99f2..268ea8c3634 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6535,4 +6535,4 @@ LLViewerObject* LLObjectSelection::getFirstMoveableObject(BOOL get_root)
 	}
 
 	return object;
-}
\ No newline at end of file
+}
-- 
GitLab