aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateranimpreview.h
diff options
context:
space:
mode:
authorArmin Weatherwax2009-06-19 14:09:27 +0200
committerMcCabe Maxsted2010-09-01 09:40:28 -0700
commit7a9c76f27af6116a5aab6029224c400c36a8cf17 (patch)
tree7c98f8006121dc75343a28789aad166d33306577 /linden/indra/newview/llfloateranimpreview.h
parentincreased preference panel size (diff)
downloadmeta-impy-7a9c76f27af6116a5aab6029224c400c36a8cf17.zip
meta-impy-7a9c76f27af6116a5aab6029224c400c36a8cf17.tar.gz
meta-impy-7a9c76f27af6116a5aab6029224c400c36a8cf17.tar.bz2
meta-impy-7a9c76f27af6116a5aab6029224c400c36a8cf17.tar.xz
quick hack: preview animation locally on own avatar when uploading.
modified: linden/indra/newview/app_settings/settings.xml modified: linden/indra/newview/llfloateranimpreview.cpp modified: linden/indra/newview/llfloateranimpreview.h modified: linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
Diffstat (limited to 'linden/indra/newview/llfloateranimpreview.h')
-rw-r--r--linden/indra/newview/llfloateranimpreview.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloateranimpreview.h b/linden/indra/newview/llfloateranimpreview.h
index 639c927..eaab186 100644
--- a/linden/indra/newview/llfloateranimpreview.h
+++ b/linden/indra/newview/llfloateranimpreview.h
@@ -32,7 +32,7 @@
32 32
33#ifndef LL_LLFLOATERANIMPREVIEW_H 33#ifndef LL_LLFLOATERANIMPREVIEW_H
34#define LL_LLFLOATERANIMPREVIEW_H 34#define LL_LLFLOATERANIMPREVIEW_H
35 35#include "llagent.h"
36#include "llfloaternamedesc.h" 36#include "llfloaternamedesc.h"
37#include "lldynamictexture.h" 37#include "lldynamictexture.h"
38#include "llcharacter.h" 38#include "llcharacter.h"
@@ -55,7 +55,10 @@ public:
55 void pan(F32 right, F32 up); 55 void pan(F32 right, F32 up);
56 virtual BOOL needsUpdate() { return mNeedsUpdate; } 56 virtual BOOL needsUpdate() { return mNeedsUpdate; }
57 57
58 LLVOAvatar* getDummyAvatar() { return mDummyAvatar; } 58// LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
59// HACK:don't get a dummy...
60 LLVOAvatar* getDummyAvatar() { return gAgent.getAvatarObject();}
61
59 62
60protected: 63protected:
61 BOOL mNeedsUpdate; 64 BOOL mNeedsUpdate;
@@ -75,13 +78,13 @@ public:
75 virtual ~LLFloaterAnimPreview(); 78 virtual ~LLFloaterAnimPreview();
76 79
77 BOOL postBuild(); 80 BOOL postBuild();
78 81/*
79 BOOL handleMouseDown(S32 x, S32 y, MASK mask); 82 BOOL handleMouseDown(S32 x, S32 y, MASK mask);
80 BOOL handleMouseUp(S32 x, S32 y, MASK mask); 83 BOOL handleMouseUp(S32 x, S32 y, MASK mask);
81 BOOL handleHover(S32 x, S32 y, MASK mask); 84 BOOL handleHover(S32 x, S32 y, MASK mask);
82 BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); 85 BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
83 void onMouseCaptureLost(); 86 void onMouseCaptureLost();
84 87*/
85 void refresh(); 88 void refresh();
86 89
87 static void onBtnPlay(void*); 90 static void onBtnPlay(void*);