From 150a190ac5ece99fe9e2c8eafaf6dbf0af02dca1 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 25 Oct 2010 19:48:41 -0700 Subject: Cleaned up the ugly Phoenix code for #637 and made it translatable --- linden/indra/newview/llagent.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'linden/indra/newview/llagent.h') diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h index 03b0045..6bc4dac 100644 --- a/linden/indra/newview/llagent.h +++ b/linden/indra/newview/llagent.h @@ -767,17 +767,6 @@ public: BOOL mInitialized; - static BOOL lure_show; - static std::string lure_name; - static LLVector3d lure_posglobal; - static U16 lure_global_x; - static U16 lure_global_y; - static int lure_x; - static int lure_y; - static int lure_z; - static std::string lure_maturity; - - S32 mNumPendingQueries; S32* mActiveCacheQueries; @@ -793,8 +782,18 @@ public: LLFrameTimer mDoubleTapRunTimer; EDoubleTapRunMode mDoubleTapRunMode; - static void showLureDestination(const std::string fromname, const int global_x, const int global_y, const int x, const int y, const int z, const std::string maturity); - static void onFoundLureDestination(); + BOOL mLureShow; + std::string mLureName; + LLVector3d mLurePosGlobal; + U16 mLureGlobalX; + U16 mLureGlobalY; + S32 mLureX; + S32 mLureY; + S32 mLureZ; + std::string mLureMaturityString; + + void showLureDestination(const std::string fromname, const S32 global_x, const S32 global_y, const S32 x, const S32 y, const S32 z, const std::string maturity); + void onFoundLureDestination(); private: bool mbTeleportKeepsLookAt; -- cgit v1.1