1 files changed, 38 insertions, 35 deletions

diff --git a/linden/indra/newview/floaterao.h b/linden/indra/newview/floaterao.h
index 465f32e..45fd7af 100644
--- a/linden/indra/newview/floaterao.h
+++ b/linden/indra/newview/floaterao.h
@@ -9,35 +9,35 @@
 
 class AONoteCardDropTarget;
 
-const int STATE_AGENT_IDLE = 0;
-const int STATE_AGENT_WALK = 1;
-const int STATE_AGENT_RUN = 2;
-const int STATE_AGENT_STAND = 3;
+const S32 STATE_AGENT_IDLE = 0;
+const S32 STATE_AGENT_WALK = 1;
+const S32 STATE_AGENT_RUN = 2;
+const S32 STATE_AGENT_STAND = 3;
 
-const int STATE_AGENT_PRE_JUMP = 4;
-const int STATE_AGENT_JUMP = 5;
-const int STATE_AGENT_TURNLEFT = 6;
-const int STATE_AGENT_TURNRIGHT = 7;
+const S32 STATE_AGENT_PRE_JUMP = 4;
+const S32 STATE_AGENT_JUMP = 5;
+const S32 STATE_AGENT_TURNLEFT = 6;
+const S32 STATE_AGENT_TURNRIGHT = 7;
 
-const int STATE_AGENT_SIT = 8;
-const int STATE_AGENT_GROUNDSIT = 9;
+const S32 STATE_AGENT_SIT = 8;
+const S32 STATE_AGENT_GROUNDSIT = 9;
 
-const int STATE_AGENT_HOVER = 10;
-const int STATE_AGENT_HOVER_DOWN = 11;
-const int STATE_AGENT_HOVER_UP = 12;
-
-const int STATE_AGENT_CROUCH = 13;
-const int STATE_AGENT_CROUCHWALK = 14;
-const int STATE_AGENT_FALLDOWN = 15;
-const int STATE_AGENT_STANDUP = 16;
-const int STATE_AGENT_LAND = 17;
-
-const int STATE_AGENT_FLY = 18;
-const int STATE_AGENT_FLYSLOW = 19;
+const S32 STATE_AGENT_HOVER = 10;
+const S32 STATE_AGENT_HOVER_DOWN = 11;
+const S32 STATE_AGENT_HOVER_UP = 12;
 
+const S32 STATE_AGENT_CROUCH = 13;
+const S32 STATE_AGENT_CROUCHWALK = 14;
+const S32 STATE_AGENT_FALLDOWN = 15;
+const S32 STATE_AGENT_STANDUP = 16;
+const S32 STATE_AGENT_LAND = 17;
 
+const S32 STATE_AGENT_FLY = 18;
+const S32 STATE_AGENT_FLYSLOW = 19;
 
 
+class LLFrameTimer;
+class LLComboBox;
 
 class AOStandTimer : public LLEventTimer
 {
@@ -51,10 +51,12 @@ public:
 class AOInvTimer : public LLEventTimer
 {
 public:
-        static BOOL fullfetch;
         AOInvTimer();
         ~AOInvTimer();
         BOOL tick();
+
+private:
+        static BOOL sInitialized;
 };
 
 class LLFloaterAO : public LLFloater
@@ -66,7 +68,7 @@ public:
     virtual ~LLFloaterAO();
 
         static void show(void*);
-        static void init();
+        static bool init();
 
         static void onClickToggleAO(LLUICtrl *, void*);
         static void onClickToggleSits(LLUICtrl *, void*);
@@ -75,13 +77,13 @@ public:
 
         static BOOL loadAnims();
 
-        static int getAnimationState();
-        static void setAnimationState(int state);
+        static S32 getAnimationState();
+        static void setAnimationState(S32 state);
         static void setStates(const LLUUID& id, BOOL start);
 
         static LLUUID getCurrentStandId();
         static void setCurrentStandId(const LLUUID& id);
-        static int stand_iterator;
+        static S32 stand_iterator;
         static BOOL ChangeStand();
 
         static BOOL startMotion(const LLUUID& id, F32 time_offset = 0.f, BOOL stand = FALSE);
@@ -89,9 +91,9 @@ public:
 
         static LLUUID GetAnimID(const LLUUID& id);
 
-        static int GetStateFromAnimID(const LLUUID& id);
-        static LLUUID GetAnimIDFromState(const int state);
-        static int GetStateFromToken(std::string strtoken);
+        static S32 GetStateFromAnimID(const LLUUID& id);
+        static LLUUID GetAnimIDFromState(const S32 state);
+        static S32 GetStateFromToken(std::string strtoken);
 
         static void onClickLess(void* data) ;
         static void onClickMore(void* data) ;
@@ -105,19 +107,20 @@ public:
         static LLUUID invfolderid;
         static const LLUUID& getAssetIDByName(const std::string& name);
 
-        static bool getInstance();
+        static LLFloaterAO* getInstance();
+        static bool getVisible();
         
 private:
 
         static LLFloaterAO* sInstance;
-        static int mAnimationState;
-        static LLUUID mCurrentStandId;
+        static S32 sAnimationState;
+        static LLUUID sCurrentStandId;
 
-        static AONoteCardDropTarget* mAOItemDropTarget;
+        static AONoteCardDropTarget* sAOItemDropTarget;
         static void AOItemDrop(LLViewerInventoryItem* item);
         static void onSpinnerCommit(LLUICtrl* ctrl, void* userdata);
         static void onComboBoxCommit(LLUICtrl* ctrl, void* userdata);
-        static BOOL SetDefault(void *userdata, LLUUID ao_id, std::string defaultanim);
+        static bool setDefault(void *userdata, LLUUID ao_id, std::string defaultanim);
 
         BOOL                                    mDirty;