diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-18 15:04:37 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-18 15:04:37 -0500 |
| commit | fd71944170e69b0fc47b45c385c33ef7acf4cafb (patch) | |
| tree | 48e1718597245815e9a418da8cb71914e09e9a84 /indra/newview | |
| parent | 4d3a6fc8d16052f3cc608741a8ca97d30c899e07 (diff) | |
| parent | 43d918b7f3fe5652a20fe55bb09d27746d79a965 (diff) | |
Automated merge with ssh://nyx@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llwearable.h | 2 | ||||
| -rw-r--r-- | indra/newview/llwearablelist.cpp | 4 |
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; } |