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.

1 files changed, 31 insertions, 31 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 7ad4f1d70b..d6bfe66dc8 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -258,7 +258,7 @@ void handle_leave_group(void *);
 // File Menu
 const char* upload_pick(void* data);
 void handle_upload(void* data);
-void handle_upload_object(void* data);
+//void handle_upload_object(void* data);
 void handle_compress_image(void*);
 BOOL enable_save_as(void *);
 
@@ -375,11 +375,11 @@ void slow_mo_animations(void *);
 void handle_disconnect_viewer(void *);
 
 void handle_stopall(void*);
-void handle_hinge(void*);
-void handle_ptop(void*);
-void handle_lptop(void*);
-void handle_wheel(void*);
-void handle_dehinge(void*);
+//void handle_hinge(void*);
+//void handle_ptop(void*);
+//void handle_lptop(void*);
+//void handle_wheel(void*);
+//void handle_dehinge(void*);
 BOOL enable_dehinge(void*);
 void handle_force_delete(void*);
 void print_object_info(void*);
@@ -4530,36 +4530,36 @@ class LLToolsStopAllAnimations : public view_listener_t
 	}
 };
 
-void handle_hinge(void*)
-{
-	gSelectMgr->sendHinge(1);
-}
+//void handle_hinge(void*)
+//{
+//	gSelectMgr->sendHinge(1);
+//}
 
-void handle_ptop(void*)
-{
-	gSelectMgr->sendHinge(2);
-}
+//void handle_ptop(void*)
+//{
+//	gSelectMgr->sendHinge(2);
+//}
 
-void handle_lptop(void*)
-{
-	gSelectMgr->sendHinge(3);
-}
+//void handle_lptop(void*)
+//{
+//	gSelectMgr->sendHinge(3);
+//}
 
-void handle_wheel(void*)
-{
-	gSelectMgr->sendHinge(4);
-}
+//void handle_wheel(void*)
+//{
+//	gSelectMgr->sendHinge(4);
+//}
 
-void handle_dehinge(void*)
-{
-	gSelectMgr->sendDehinge();
-}
+//void handle_dehinge(void*)
+//{
+//	gSelectMgr->sendDehinge();
+//}
 
-BOOL enable_dehinge(void*)
-{
-	LLViewerObject* obj = gSelectMgr->getSelection()->getFirstEditableObject();
-	return obj && !obj->isAttachment();
-}
+//BOOL enable_dehinge(void*)
+//{
+//	LLViewerObject* obj = gSelectMgr->getSelection()->getFirstEditableObject();
+//	return obj && !obj->isAttachment();
+//}
 
 
 class LLEditEnableCut : public view_listener_t