From 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 Mon Sep 17 00:00:00 2001
From: Tess Chu <tess@lindenlab.com>
Date: Wed, 11 Jul 2007 21:29:02 +0000
Subject: svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088
 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired
 by Tess and rdw.

---
 indra/newview/llselectmgr.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llselectmgr.cpp')

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 274da6d3d1..0ab674dfcd 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -3668,6 +3668,7 @@ void LLSelectMgr::sendDelink()
 // Hinges
 //----------------------------------------------------------------------
 
+/*
 void LLSelectMgr::sendHinge(U8 type)
 {
 	if (!mSelectedObjects->getNumNodes())
@@ -3697,7 +3698,7 @@ void LLSelectMgr::sendDehinge()
 		packObjectLocalID,
 		NULL,
 		SEND_ONLY_ROOTS);
-}
+}*/
 
 void LLSelectMgr::sendSelect()
 {
-- 
cgit v1.2.3