diff options
author | andreykproductengine <akleshchev@productengine.com> | 2014-10-10 09:20:42 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2014-10-10 09:20:42 +0300 |
commit | a9692c233e4e4a910e6a01f06a6ce3641af5735d (patch) | |
tree | 1f59a27d50e9a9e09959f9bdda49c71883ad624e /indra/newview/llselectmgr.h | |
parent | f1519deb9ed8aacc2cc5d9c023bb7f5abba62313 (diff) |
MAINT-3202 FIXED Cancel of selected colour in "Colour picker" floater does not return colour icon to previous condition
Diffstat (limited to 'indra/newview/llselectmgr.h')
-rwxr-xr-x | indra/newview/llselectmgr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index a68328167a..9906dfd524 100755 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -179,6 +179,7 @@ public: void setObject(LLViewerObject* object); // *NOTE: invalidate stored textures and colors when # faces change void saveColors(); + void saveShinyColors(); void saveTextures(const uuid_vec_t& textures); void saveTextureScaleRatios(LLRender::eTexIndex index_to_query); @@ -215,6 +216,7 @@ public: std::string mSitName; U64 mCreationDate; std::vector<LLColor4> mSavedColors; + std::vector<LLColor4> mSavedShinyColors; uuid_vec_t mSavedTextures; std::vector<LLVector3> mTextureScaleRatios; std::vector<LLVector3> mSilhouetteVertices; // array of vertices to render silhouette of object @@ -545,6 +547,7 @@ public: //////////////////////////////////////////////////////////////// void saveSelectedObjectTransform(EActionType action_type); void saveSelectedObjectColors(); + void saveSelectedShinyColors(); void saveSelectedObjectTextures(); // Sets which texture channel to query for scale and rot of display @@ -573,6 +576,7 @@ public: void selectionSetColorOnly(const LLColor4 &color); // Set only the RGB channels void selectionSetAlphaOnly(const F32 alpha); // Set only the alpha channel void selectionRevertColors(); + void selectionRevertShinyColors(); BOOL selectionRevertTextures(); void selectionSetBumpmap( U8 bumpmap ); void selectionSetTexGen( U8 texgen ); |