diff options
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index d0e326c..bd8b6ab 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -2384,7 +2384,7 @@ class LLObjectImportUpload : public view_listener_t | |||
2384 | } | 2384 | } |
2385 | }; | 2385 | }; |
2386 | 2386 | ||
2387 | bool handle_go_to() | 2387 | bool handle_go_to_confirm() |
2388 | { | 2388 | { |
2389 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | 2389 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) |
2390 | if ( (rlv_handler_t::isEnabled()) && gAgent.forwardGrabbed() && (gRlvHandler.hasLockedAttachment()) ) | 2390 | if ( (rlv_handler_t::isEnabled()) && gAgent.forwardGrabbed() && (gRlvHandler.hasLockedAttachment()) ) |
@@ -2404,6 +2404,22 @@ bool handle_go_to() | |||
2404 | return true; | 2404 | return true; |
2405 | } | 2405 | } |
2406 | 2406 | ||
2407 | |||
2408 | bool handle_go_to() | ||
2409 | { | ||
2410 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | ||
2411 | if ( (rlv_handler_t::isEnabled()) && gAgent.forwardGrabbed() && (gRlvHandler.hasLockedAttachment()) ) | ||
2412 | { | ||
2413 | return true; | ||
2414 | } | ||
2415 | // [/RLVa:KB] | ||
2416 | |||
2417 | handle_go_to_callback( 0, (void*)LLToolPie::getInstance() ); | ||
2418 | |||
2419 | return true; | ||
2420 | } | ||
2421 | |||
2422 | |||
2407 | //static | 2423 | //static |
2408 | void handle_go_to_callback(S32 option, void *userdata) | 2424 | void handle_go_to_callback(S32 option, void *userdata) |
2409 | { | 2425 | { |