diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-11-19 14:26:59 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-11-19 14:26:59 -0500 |
| commit | 2aa56069f458441daa74a86a8805763482f02fd6 (patch) | |
| tree | c0ed561f408d82f1783afed8b4f1fc2ea2e3f446 | |
| parent | ee810bf2abe230769bd5ee81dc76e54d5fcda34c (diff) | |
WIP SH-3339 Only try to increment the cof version if in a server bake region.
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/llpaneleditwearable.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 997edbab07..ad55936cab 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -1071,6 +1071,12 @@ void LLIncrementCofVersionResponder::error(U32 pStatus, const std::string& pReas } //static +void LLPanelEditWearable::incrementCofVersion() +{ + incrementCofVersion(0); +} + +//static void LLPanelEditWearable::incrementCofVersion(S32 retries) { // Create a response handler @@ -1125,7 +1131,10 @@ void LLPanelEditWearable::saveChanges(bool force_save_as) gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name); } - LLPanelEditWearable::incrementCofVersion(0); + if (gAgentAvatarp->isUsingServerBakes()) + { + LLPanelEditWearable::incrementCofVersion(0); + } } void LLPanelEditWearable::revertChanges() diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 9c9eac791e..67217f8751 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -78,6 +78,7 @@ public: virtual void setVisible(BOOL visible); + static void incrementCofVersion(); static void incrementCofVersion(S32 retries); private: |