summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-02-14 15:46:27 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-02-14 15:46:27 +0200
commit6e06281477840e2403d52510b54bf2cd99dd8216 (patch)
tree5463d6c3314470cc2afcb30423be5577bf307edf /indra/newview
parent67edb011b5b803c21652c9735e03a387f26a77d5 (diff)
MAINT-7104 whitespace clean-up
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatergridstatus.cpp2
-rw-r--r--indra/newview/llfloatergridstatus.h30
2 files changed, 16 insertions, 16 deletions
diff --git a/indra/newview/llfloatergridstatus.cpp b/indra/newview/llfloatergridstatus.cpp
index 3429203afe..c47ff1c1d9 100644
--- a/indra/newview/llfloatergridstatus.cpp
+++ b/indra/newview/llfloatergridstatus.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2017, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/indra/newview/llfloatergridstatus.h b/indra/newview/llfloatergridstatus.h
index 1608515003..0c3deb7d4c 100644
--- a/indra/newview/llfloatergridstatus.h
+++ b/indra/newview/llfloatergridstatus.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2017, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -36,32 +36,32 @@ class LLMediaCtrl;
class LLFloaterGridStatus :
- public LLFloaterWebContent
+ public LLFloaterWebContent
{
public:
- typedef LLSDParamAdapter<_Params> Params;
+ typedef LLSDParamAdapter<_Params> Params;
- LLFloaterGridStatus(const Params& key);
+ LLFloaterGridStatus(const Params& key);
- /*virtual*/ void onOpen(const LLSD& key);
- /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);
+ /*virtual*/ void onOpen(const LLSD& key);
+ /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);
- static bool checkGridStatusRSS();
- static void getGridStatusRSSCoro();
+ static bool checkGridStatusRSS();
+ static void getGridStatusRSSCoro();
- void startGridStatusTimer();
- BOOL isFirstUpdate() { return mIsFirstUpdate; }
- void setFirstUpdate(BOOL first_update) { mIsFirstUpdate = first_update; }
+ void startGridStatusTimer();
+ BOOL isFirstUpdate() { return mIsFirstUpdate; }
+ void setFirstUpdate(BOOL first_update) { mIsFirstUpdate = first_update; }
- static LLFloaterGridStatus* getInstance();
+ static LLFloaterGridStatus* getInstance();
private:
- /*virtual*/ BOOL postBuild();
+ /*virtual*/ BOOL postBuild();
- void applyPreferredRect();
+ void applyPreferredRect();
- static std::map<std::string, std::string> sItemsMap;
+ static std::map<std::string, std::string> sItemsMap;
LLFrameTimer mGridStatusTimer;
BOOL mIsFirstUpdate;