diff options
author | dolphin <dolphin@lindenlab.com> | 2013-09-09 11:19:41 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-09-09 11:19:41 -0700 |
commit | 51c01f5294b68b66706685346ecea16246b85cce (patch) | |
tree | ea97dd2ed8661026a283d509c84acdf99cc6a1d4 /indra | |
parent | 541e92c3653e112ec54ea322c9c5c54cacb0fd21 (diff) |
More explicitnexx for the mac build
Also update the experience cache when the update returns.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llmessage/llexperiencecache.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llfloaterexperienceprofile.cpp | 3 | ||||
-rw-r--r-- | indra/newview/llfloaterexperienceprofile.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp index 2e260ecdef..b131156905 100644 --- a/indra/llmessage/llexperiencecache.cpp +++ b/indra/llmessage/llexperiencecache.cpp @@ -577,7 +577,7 @@ namespace LLExperienceCache { if(experience_data.has(EXPERIENCE_ID)) { - sCache[experience_data[EXPERIENCE_ID].asUUID()]=experience_data; + processExperience(experience_data[EXPERIENCE_ID].asUUID(), experience_data); } else { diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp index e1e4039626..a565b5c8e7 100644 --- a/indra/newview/llfloaterexperienceprofile.cpp +++ b/indra/newview/llfloaterexperienceprofile.cpp @@ -496,7 +496,7 @@ BOOL LLFloaterExperienceProfile::canClose() } } -bool LLFloaterExperienceProfile::handleSaveChangesDialog( const LLSD& notification, const LLSD& response, int action ) +bool LLFloaterExperienceProfile::handleSaveChangesDialog( const LLSD& notification, const LLSD& response, PostSaveAction action ) { S32 option = LLNotificationsUtil::getSelectedOption(notification, response); switch( option ) @@ -615,6 +615,7 @@ void LLFloaterExperienceProfile::onSaveComplete( const LLSD& content ) } refreshExperience(*it); + LLExperienceCache::insert(*it); LLExperienceCache::fetch(id, true); if(mSaveCompleteAction==VIEW) diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index c32f274206..1f1e135c01 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -41,7 +41,7 @@ class LLFloaterExperienceProfile : public LLFloater { LOG_CLASS(LLFloaterExperienceProfile); public: - enum + enum PostSaveAction { NOTHING, CLOSE, @@ -74,7 +74,7 @@ protected: BOOL postBuild(); bool setMaturityString(U8 maturity, LLTextBox* child, LLComboBox* combo); - bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, int action); + bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, PostSaveAction action); void doSave( int success_action ); LLUUID mExperienceId; LLSD mExperienceDetails; |