diff options
Diffstat (limited to 'indra/llui/llresmgr.h')
| -rw-r--r-- | indra/llui/llresmgr.h | 66 |
1 files changed, 2 insertions, 64 deletions
diff --git a/indra/llui/llresmgr.h b/indra/llui/llresmgr.h index 1a452f7381..2e39387ae1 100644 --- a/indra/llui/llresmgr.h +++ b/indra/llui/llresmgr.h @@ -36,6 +36,7 @@ #include "locale.h" #include "stdtypes.h" #include "llstring.h" +#include "llmemory.h" enum LLLOCALE_ID { @@ -44,67 +45,6 @@ enum LLLOCALE_ID LLLOCALE_COUNT // Number of values in this enum. Keep at end. }; -/* -enum LLSTR_ID -{ - LLSTR_HELLO, - LLSTR_GOODBYE, - LLSTR_CHAT_LABEL, - LLSTR_STATUS_LABEL, - LLSTR_X, - LLSTR_Y, - LLSTR_Z, - LLSTR_POSITION, - LLSTR_SCALE, - LLSTR_ROTATION, - LLSTR_HAS_PHYSICS, - LLSTR_SCRIPT, - LLSTR_HELP, - LLSTR_REMOVE, - LLSTR_CLEAR, - LLSTR_APPLY, - LLSTR_CANCEL, - LLSTR_MATERIAL, - LLSTR_FACE, - LLSTR_TEXTURE, - LLSTR_TEXTURE_SIZE, - LLSTR_TEXTURE_OFFSET, - LLSTR_TEXTURE_ROTATION, - LLSTR_U, - LLSTR_V, - LLSTR_OWNERSHIP, - LLSTR_PUBLIC, - LLSTR_PRIVATE, - LLSTR_REVERT, - LLSTR_INSERT_SAMPLE, - LLSTR_SET_TEXTURE, - LLSTR_EDIT_SCRIPT, - LLSTR_MOUSELOOK_INSTRUCTIONS, - LLSTR_EDIT_FACE_INSTRUCTIONS, - LLSTR_CLOSE, - LLSTR_MOVE, - LLSTR_ROTATE, - LLSTR_RESIZE, - LLSTR_PLACE_BOX, - LLSTR_PLACE_PRISM, - LLSTR_PLACE_PYRAMID, - LLSTR_PLACE_TETRAHEDRON, - LLSTR_PLACE_CYLINDER, - LLSTR_PLACE_HALF_CYLINDER, - LLSTR_PLACE_CONE, - LLSTR_PLACE_HALF_CONE, - LLSTR_PLACE_SPHERE, - LLSTR_PLACE_HALF_SPHERE, - LLSTR_PLACE_BIRD, - LLSTR_PLACE_SNAKE, - LLSTR_PLACE_ROCK, - LLSTR_PLACE_TREE, - LLSTR_PLACE_GRASS, - LLSTR_MODIFY_LAND, - LLSTR_COUNT // Number of values in this enum. Keep at end. -}; -*/ - enum LLFONT_ID { LLFONT_OCRA, @@ -117,7 +57,7 @@ enum LLFONT_ID class LLFontGL; -class LLResMgr +class LLResMgr : public LLSingleton<LLResMgr> { public: LLResMgr(); @@ -162,6 +102,4 @@ private: LLString mPrevLocaleString; }; -extern LLResMgr* gResMgr; - #endif // LL_RESMGR_ |