Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/lldonotdisturbnotificationstorage.h b/indra/newview/lldonotdisturbnotificationstorage.h
index 237d58b4de..1432d37de6 100644
--- a/indra/newview/lldonotdisturbnotificationstorage.h
+++ b/indra/newview/lldonotdisturbnotificationstorage.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   lldonotdisturbnotificationstorage.h
 * @brief  Header file for lldonotdisturbnotificationstorage
 * @author Stinson@lindenlab.com
@@ -47,18 +47,18 @@ public:
 
 class LLDoNotDisturbNotificationStorage : public LLParamSingleton<LLDoNotDisturbNotificationStorage>, public LLNotificationStorage
 {
-	LLSINGLETON(LLDoNotDisturbNotificationStorage);
-	~LLDoNotDisturbNotificationStorage();
+    LLSINGLETON(LLDoNotDisturbNotificationStorage);
+    ~LLDoNotDisturbNotificationStorage();
 
-	LOG_CLASS(LLDoNotDisturbNotificationStorage);
+    LOG_CLASS(LLDoNotDisturbNotificationStorage);
 public:
     static const char * toastName;
     static const char * offerName;
 
     bool getDirty();
     void resetDirty();
-	void saveNotifications();
-	void loadNotifications();
+    void saveNotifications();
+    void loadNotifications();
     void updateNotifications();
     void removeNotification(const char * name, const LLUUID& id);
     void reset();
@@ -71,8 +71,8 @@ private:
     bool mDirty;
     LLDoNotDisturbNotificationStorageTimer mTimer;
 
-	LLNotificationChannelPtr getCommunicationChannel() const;
-	bool                     onChannelChanged(const LLSD& pPayload);
+    LLNotificationChannelPtr getCommunicationChannel() const;
+    bool                     onChannelChanged(const LLSD& pPayload);
     std::map<std::string, std::string> nameToPayloadParameterMap;
 };