aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-06 21:51:06 -0700
committerMcCabe Maxsted2009-09-06 21:51:06 -0700
commit18e1aead704e0605ceefb9e47db9acdb4c40928e (patch)
tree238ca469419f09df900d31df5d1eb8e97e1f34cb /linden/indra/newview/llviewermenu.cpp
parentStart fetching inventory at startup (diff)
downloadmeta-impy-18e1aead704e0605ceefb9e47db9acdb4c40928e.zip
meta-impy-18e1aead704e0605ceefb9e47db9acdb4c40928e.tar.gz
meta-impy-18e1aead704e0605ceefb9e47db9acdb4c40928e.tar.bz2
meta-impy-18e1aead704e0605ceefb9e47db9acdb4c40928e.tar.xz
Added Emerald viewer's animation list
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r--linden/indra/newview/llviewermenu.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 3be857e..b937894 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -210,6 +210,8 @@
210 210
211#include "lltexlayer.h" 211#include "lltexlayer.h"
212 212
213#include "jcfloater_animation_list.h"
214
213void init_client_menu(LLMenuGL* menu); 215void init_client_menu(LLMenuGL* menu);
214void init_server_menu(LLMenuGL* menu); 216void init_server_menu(LLMenuGL* menu);
215 217
@@ -5218,6 +5220,10 @@ class LLShowFloater : public view_listener_t
5218 { 5220 {
5219 LLFloaterActiveSpeakers::toggleInstance(LLSD()); 5221 LLFloaterActiveSpeakers::toggleInstance(LLSD());
5220 } 5222 }
5223 else if (floater_name == "animation list")
5224 {
5225 JCFloaterAnimList::toggleInstance(LLSD());
5226 }
5221 else if (floater_name == "inworld browser") 5227 else if (floater_name == "inworld browser")
5222 { 5228 {
5223 LLFloaterMediaBrowser::toggle(); 5229 LLFloaterMediaBrowser::toggle();