diff options
| author | callum_linden <none@none> | 2014-10-20 11:21:54 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-20 11:21:54 -0700 |
| commit | 1a974f227de5f3d6c42dd5b836acab8edd28171c (patch) | |
| tree | 5683d0a6051de1c4747178f46155f9f174351df5 /indra/llappearance | |
| parent | 42cb9e655a3ada775ff9f432bb23afd47aa6a3ad (diff) | |
Update to build on Xcode 6.0: typedef declared protected incorrectly here
Diffstat (limited to 'indra/llappearance')
| -rwxr-xr-x | indra/llappearance/llwearable.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llappearance/llwearable.h b/indra/llappearance/llwearable.h index 406fc7e883..630eb1e3a5 100755 --- a/indra/llappearance/llwearable.h +++ b/indra/llappearance/llwearable.h @@ -113,6 +113,9 @@ public: // 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 @@ protected: 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 }; |