diff options
| author | callum <none@none> | 2010-10-04 17:40:59 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-10-04 17:40:59 -0700 |
| commit | 21c8dea4e460939aae0767e791f3efed03dc91b3 (patch) | |
| tree | fee1d569617bbe97a2e492a73deae7383da65868 /indra/llui/llnotifications.h | |
| parent | 89efb318141bb504597e525f186ea1a43502eac4 (diff) | |
| parent | 7af6d1c7319bc0f339e9159161c05ed6eb45fb5b (diff) | |
Test merge
Diffstat (limited to 'indra/llui/llnotifications.h')
| -rw-r--r-- | indra/llui/llnotifications.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index 98ff035170..5298549b58 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -580,7 +580,7 @@ public: std::string summarize() const; bool hasUniquenessConstraints() const; - + bool matchesTag(const std::string& tag); virtual ~LLNotification() {} @@ -863,7 +863,7 @@ public: // load notification descriptions from file; // OK to call more than once because it will reload bool loadTemplates(); - + // load visibility rules from file; // OK to call more than once because it will reload bool loadVisibilityRules(); @@ -929,7 +929,7 @@ public: void setIgnoreAllNotifications(bool ignore); bool getIgnoreAllNotifications(); - + bool isVisibleByRules(LLNotificationPtr pNotification); private: @@ -950,7 +950,7 @@ private: // put your template in bool addTemplate(const std::string& name, LLNotificationTemplatePtr theTemplate); TemplateMap mTemplates; - + VisibilityRuleList mVisibilityRules; std::string mFileName; |