diff options
| author | Richard Linden <none@none> | 2010-08-19 13:41:50 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-19 13:41:50 -0700 |
| commit | aa8db56fff94aac4866a187e7c7c8488866a991b (patch) | |
| tree | 73b0aa7a16a1b2df2031806c552253f6933e3a47 /indra/newview/llfirstuse.cpp | |
| parent | 25367cb33a4ae3df474b2d77e04bf44625efde4b (diff) | |
| parent | 7c80b591610e8f7467c40ce3585796e67390fb3e (diff) | |
merge
Diffstat (limited to 'indra/newview/llfirstuse.cpp')
| -rw-r--r-- | indra/newview/llfirstuse.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index e9a9203a96..c153f8b787 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -90,7 +90,7 @@ void LLFirstUse::sit(bool enable) } // static -void LLFirstUse::inventoryOffer(bool enable) +void LLFirstUse::newInventory(bool enable) { firstUseNotification("FirstInventoryOffer", enable, "HintInventory", LLSD(), LLSD().with("target", "inventory_btn").with("direction", "left")); } @@ -147,6 +147,8 @@ void LLFirstUse::firstUseNotification(const std::string& control_var, bool enabl { LL_DEBUGS("LLFirstUse") << "Disabling first use notification " << notification_name << LL_ENDL; LLNotifications::instance().cancelByName(notification_name); + // redundantly clear settings var here, in case there are no notifications to cancel + gWarningSettings.setBOOL(control_var, FALSE); } } |