diff options
author | Tess Chu <tess@lindenlab.com> | 2007-07-11 21:29:02 +0000 |
---|---|---|
committer | Tess Chu <tess@lindenlab.com> | 2007-07-11 21:29:02 +0000 |
commit | 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 (patch) | |
tree | f89014544fc276b283a36eb2e0cb52e93806a44a /indra/newview/llselectmgr.cpp | |
parent | a6769f262ff910949a7e1c81cf98e52ddfc2d44a (diff) |
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.
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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() { |