summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertos.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-06-10 17:06:06 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-06-10 19:25:02 +0300
commit0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch)
treeccf664c765d1adbbf4985069321df65c85ca36e2 /indra/newview/llfloatertos.h
parentbd8438f7083643ae5812b14e35e69e69ef1616c6 (diff)
parentd317454c82e016a02c8a708a0118f3ff29aa8e82 (diff)
Merge main into inventory_favorites
# Conflicts: # indra/llui/llfolderviewmodel.h # indra/newview/llpanelwearing.cpp # indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/newview/llfloatertos.h')
-rw-r--r--indra/newview/llfloatertos.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h
index 7c2f0705b7..b4f08be00b 100644
--- a/indra/newview/llfloatertos.h
+++ b/indra/newview/llfloatertos.h
@@ -1,25 +1,25 @@
-/**
+/**
* @file llfloatertos.h
* @brief Terms of Service Agreement dialog
*
* $LicenseInfo:firstyear=2003&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, 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
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -39,37 +39,37 @@ class LLRadioGroup;
class LLTextEditor;
class LLUUID;
-class LLFloaterTOS :
- public LLModalDialog,
- public LLViewerMediaObserver
+class LLFloaterTOS :
+ public LLModalDialog,
+ public LLViewerMediaObserver
{
public:
- LLFloaterTOS(const LLSD& data);
- virtual ~LLFloaterTOS();
+ LLFloaterTOS(const LLSD& data);
+ virtual ~LLFloaterTOS();
+
+ BOOL postBuild();
- BOOL postBuild();
-
- virtual void draw();
+ virtual void draw();
- static void updateAgree( LLUICtrl *, void* userdata );
- static void onContinue( void* userdata );
- static void onCancel( void* userdata );
+ static void updateAgree( LLUICtrl *, void* userdata );
+ static void onContinue( void* userdata );
+ static void onCancel( void* userdata );
- void setSiteIsAlive( bool alive );
+ void setSiteIsAlive( bool alive );
- void updateAgreeEnabled(bool enabled);
+ void updateAgreeEnabled(bool enabled);
- // inherited from LLViewerMediaObserver
- /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+ // inherited from LLViewerMediaObserver
+ /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
private:
static void testSiteIsAliveCoro(LLHandle<LLFloater> handle, std::string url);
- std::string mMessage;
- bool mLoadingScreenLoaded;
- bool mSiteAlive;
- bool mRealNavigateBegun;
- std::string mReplyPumpName;
+ std::string mMessage;
+ bool mLoadingScreenLoaded;
+ bool mSiteAlive;
+ bool mRealNavigateBegun;
+ std::string mReplyPumpName;
};