summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-12-18 15:04:21 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-12-18 15:04:21 -0500
commit43d918b7f3fe5652a20fe55bb09d27746d79a965 (patch)
tree98ad073f4e467a6528619d1ecd2929547cb4bfbe /indra/newview
parentad65fa11acdf7f655f32e6ca43b2f2bc997ef1e6 (diff)
EXT-3123 cannot decline save for newly created wearable
We weren't marking the initially loaded parameters of a wearable created through the appearance editor as "saved" so the client thought the wearable was dirty when it wasn't. Added a call to mark all parameters as saved right before sending the wearable to the server. reviewed by Bigpapi
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llwearable.h2
-rw-r--r--indra/newview/llwearablelist.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h
index 82d388ab7e..7a579b248e 100644
--- a/indra/newview/llwearable.h
+++ b/indra/newview/llwearable.h
@@ -127,6 +127,7 @@ public:
void setClothesColor( S32 te, const LLColor4& new_color, BOOL upload_bake );
void revertValues();
+ void saveValues();
BOOL isOnTop() const;
@@ -143,7 +144,6 @@ private:
void createLayers(S32 te);
void createVisualParams();
- void saveValues();
void syncImages(te_map_t &src, te_map_t &dst);
void destroyTextures();
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp
index bd7619f7e5..5636256856 100644
--- a/indra/newview/llwearablelist.cpp
+++ b/indra/newview/llwearablelist.cpp
@@ -249,9 +249,13 @@ LLWearable* LLWearableList::createNewWearable( EWearableType type )
wearable->setParamsToDefaults();
wearable->setTexturesToDefaults();
+ //mark all values (params & images) as saved
+ wearable->saveValues();
+
// Send to the dataserver
wearable->saveNewAsset();
+
return wearable;
}