From 875606a04d656ef6e5600a3a7fb6e8b52feb1945 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 11 May 2008 20:56:42 +0000 Subject: QAR-566 maint-viewer-5-merge-2 Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release --- indra/newview/llviewermenu.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewermenu.cpp') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c4cd7a3a3d..f7b9d2dc93 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -401,8 +401,8 @@ void handle_duplicate_in_place(void*); void handle_repeat_duplicate(void*); void handle_export(void*); -void handle_deed_object_to_group(void*); -BOOL enable_deed_object_to_group(void*); +// void handle_deed_object_to_group(void*); +// BOOL enable_deed_object_to_group(void*); void handle_object_owner_self(void*); void handle_object_owner_permissive(void*); void handle_object_lock(void*); @@ -3498,6 +3498,7 @@ void handle_repeat_duplicate(void*) LLSelectMgr::getInstance()->repeatDuplicate(); } +/* dead code 30-apr-2008 void handle_deed_object_to_group(void*) { LLUUID group_id; @@ -3523,6 +3524,8 @@ BOOL enable_deed_object_to_group(void*) return FALSE; } +*/ + /* * No longer able to support viewer side manipulations in this way -- cgit v1.2.3