diff options
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index aa5e791..847336d 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -416,7 +416,6 @@ void handle_force_delete(void*); | |||
416 | void print_object_info(void*); | 416 | void print_object_info(void*); |
417 | void print_agent_nvpairs(void*); | 417 | void print_agent_nvpairs(void*); |
418 | void toggle_debug_menus(void*); | 418 | void toggle_debug_menus(void*); |
419 | void toggle_map( void* user_data ); | ||
420 | void export_info_callback(LLAssetInfo *info, void **user_data, S32 result); | 419 | void export_info_callback(LLAssetInfo *info, void **user_data, S32 result); |
421 | void export_data_callback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void **user_data, S32 result); | 420 | void export_data_callback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void **user_data, S32 result); |
422 | void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status); | 421 | void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status); |
@@ -4578,22 +4577,6 @@ void toggle_debug_menus(void*) | |||
4578 | } | 4577 | } |
4579 | 4578 | ||
4580 | 4579 | ||
4581 | void toggle_map( void* user_data ) | ||
4582 | { | ||
4583 | // Toggle the item | ||
4584 | BOOL checked = gSavedSettings.getBOOL( static_cast<char*>(user_data) ); | ||
4585 | gSavedSettings.setBOOL( static_cast<char*>(user_data), !checked ); | ||
4586 | if (checked) | ||
4587 | { | ||
4588 | gFloaterMap->close(); | ||
4589 | } | ||
4590 | else | ||
4591 | { | ||
4592 | gFloaterMap->open(); /* Flawfinder: ignore */ | ||
4593 | } | ||
4594 | } | ||
4595 | |||
4596 | |||
4597 | // LLUUID gExporterRequestID; | 4580 | // LLUUID gExporterRequestID; |
4598 | // std::string gExportDirectory; | 4581 | // std::string gExportDirectory; |
4599 | 4582 | ||
@@ -5116,7 +5099,7 @@ class LLShowFloater : public view_listener_t | |||
5116 | } | 5099 | } |
5117 | else if (floater_name == "mini map") | 5100 | else if (floater_name == "mini map") |
5118 | { | 5101 | { |
5119 | LLFloaterMap::toggle(NULL); | 5102 | LLFloaterMap::toggleInstance(); |
5120 | } | 5103 | } |
5121 | else if (floater_name == "stat bar") | 5104 | else if (floater_name == "stat bar") |
5122 | { | 5105 | { |