diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llmenucommands.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/newview/llmenucommands.cpp')
-rw-r--r-- | linden/indra/newview/llmenucommands.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/linden/indra/newview/llmenucommands.cpp b/linden/indra/newview/llmenucommands.cpp index 2275047..ac77a92 100644 --- a/linden/indra/newview/llmenucommands.cpp +++ b/linden/indra/newview/llmenucommands.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -46,7 +47,6 @@ | |||
46 | #include "llviewercontrol.h" | 47 | #include "llviewercontrol.h" |
47 | #include "llfirstuse.h" | 48 | #include "llfirstuse.h" |
48 | #include "llfloaterchat.h" | 49 | #include "llfloaterchat.h" |
49 | #include "llfloaterclothing.h" | ||
50 | #include "llfloaterdirectory.h" | 50 | #include "llfloaterdirectory.h" |
51 | #include "llfloatermap.h" | 51 | #include "llfloatermap.h" |
52 | #include "llfloaterworldmap.h" | 52 | #include "llfloaterworldmap.h" |
@@ -95,7 +95,7 @@ void handle_map(void*) | |||
95 | 95 | ||
96 | void handle_mini_map(void*) | 96 | void handle_mini_map(void*) |
97 | { | 97 | { |
98 | LLFloaterMap::toggle(NULL); | 98 | LLFloaterMap::toggleInstance(); |
99 | } | 99 | } |
100 | 100 | ||
101 | 101 | ||
@@ -121,12 +121,6 @@ void handle_inventory(void*) | |||
121 | } | 121 | } |
122 | 122 | ||
123 | 123 | ||
124 | void handle_clothing(void*) | ||
125 | { | ||
126 | LLFloaterClothing::toggleVisibility(); | ||
127 | } | ||
128 | |||
129 | |||
130 | void handle_chat(void*) | 124 | void handle_chat(void*) |
131 | { | 125 | { |
132 | // give focus to chatbar if it's open but not focused | 126 | // give focus to chatbar if it's open but not focused |