Skip to content
Snippets Groups Projects
Commit 1a974f22 authored by callum_linden's avatar callum_linden
Browse files

Update to build on Xcode 6.0: typedef declared protected incorrectly here

parent 42cb9e65
No related branches found
No related tags found
No related merge requests found
......@@ -113,6 +113,9 @@ class LLWearable
// Update the baked texture hash.
virtual void addToBakedTextureHash(LLMD5& hash) const = 0;
typedef std::map<S32, LLVisualParam *> visual_param_index_map_t;
visual_param_index_map_t mVisualParamIndexMap;
protected:
typedef std::map<S32, LLLocalTextureObject*> te_map_t;
void syncImages(te_map_t &src, te_map_t &dst);
......@@ -132,9 +135,6 @@ class LLWearable
typedef std::map<S32, F32> param_map_t;
param_map_t mSavedVisualParamMap; // last saved version of visual params
typedef std::map<S32, LLVisualParam *> visual_param_index_map_t;
visual_param_index_map_t mVisualParamIndexMap;
te_map_t mTEMap; // maps TE to LocalTextureObject
te_map_t mSavedTEMap; // last saved version of TEMap
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment