From d0348a9bb9f8c63216beb649c277932486fa766c Mon Sep 17 00:00:00 2001
From: elektrahesse
Date: Thu, 7 Oct 2010 02:05:57 +0200
Subject: Fixed TOS loading and renamed corretly LLIamHere classes in TOS and
Voice TOS respectively to LLIamHereTOS and LLIamHereVoice to avoid
collisions.
---
linden/indra/newview/floatervoicelicense.cpp | 12 ++++++------
linden/indra/newview/llfloatertos.cpp | 20 +++++++++++---------
2 files changed, 17 insertions(+), 15 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/floatervoicelicense.cpp b/linden/indra/newview/floatervoicelicense.cpp
index 4004290..840a9e6 100644
--- a/linden/indra/newview/floatervoicelicense.cpp
+++ b/linden/indra/newview/floatervoicelicense.cpp
@@ -63,10 +63,10 @@ FloaterVoiceLicense::FloaterVoiceLicense(const LLSD& key)
// helper class that trys to download a URL from a web site and calls a method
// on parent class indicating if the web server is working or not
-class LLIamHere : public LLHTTPClient::Responder
+class LLIamHereVoice : public LLHTTPClient::Responder
{
private:
- LLIamHere( FloaterVoiceLicense* parent ) :
+ LLIamHereVoice( FloaterVoiceLicense* parent ) :
mParent( parent )
{}
@@ -74,9 +74,9 @@ class LLIamHere : public LLHTTPClient::Responder
public:
- static boost::intrusive_ptr< LLIamHere > build( FloaterVoiceLicense* parent )
+ static boost::intrusive_ptr< LLIamHereVoice > build( FloaterVoiceLicense* parent )
{
- return boost::intrusive_ptr< LLIamHere >( new LLIamHere( parent ) );
+ return boost::intrusive_ptr< LLIamHereVoice >( new LLIamHereVoice( parent ) );
};
virtual void setParent( FloaterVoiceLicense* parentIn )
@@ -105,7 +105,7 @@ class LLIamHere : public LLHTTPClient::Responder
// this is global and not a class member to keep crud out of the header file
namespace {
- boost::intrusive_ptr< LLIamHere > gResponsePtr = 0;
+ boost::intrusive_ptr< LLIamHereVoice > gResponsePtr = 0;
};
BOOL FloaterVoiceLicense::postBuild()
@@ -128,7 +128,7 @@ BOOL FloaterVoiceLicense::postBuild()
// start to observe it so we see navigate complete events
web_browser->addObserver( this );
- gResponsePtr = LLIamHere::build( this );
+ gResponsePtr = LLIamHereVoice::build( this );
LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
}
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 6a392e0..52d7b1f 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -89,10 +89,10 @@ LLFloaterTOS::LLFloaterTOS(ETOSType type, const std::string & message)
// helper class that trys to download a URL from a web site and calls a method
// on parent class indicating if the web server is working or not
-class LLIamHere : public LLHTTPClient::Responder
+class LLIamHereTOS : public LLHTTPClient::Responder
{
private:
- LLIamHere( LLFloaterTOS* parent ) :
+ LLIamHereTOS( LLFloaterTOS* parent ) :
mParent( parent )
{}
@@ -100,9 +100,9 @@ class LLIamHere : public LLHTTPClient::Responder
public:
- static boost::intrusive_ptr< LLIamHere > build( LLFloaterTOS* parent )
+ static boost::intrusive_ptr< LLIamHereTOS > build( LLFloaterTOS* parent )
{
- return boost::intrusive_ptr< LLIamHere >( new LLIamHere( parent ) );
+ return boost::intrusive_ptr< LLIamHereTOS >( new LLIamHereTOS( parent ) );
};
virtual void setParent( LLFloaterTOS* parentIn )
@@ -131,7 +131,7 @@ class LLIamHere : public LLHTTPClient::Responder
// this is global and not a class member to keep crud out of the header file
namespace {
- boost::intrusive_ptr< LLIamHere > gResponsePtr = 0;
+ boost::intrusive_ptr< LLIamHereTOS > gResponsePtr = 0;
};
BOOL LLFloaterTOS::postBuild()
@@ -142,13 +142,15 @@ BOOL LLFloaterTOS::postBuild()
if ( mType != TOS_TOS )
{
+ llinfos << "tos_type != TOS_TOS" << llendl;
// this displays the critical message
LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
editor->setHandleEditKeysDirectly( TRUE );
editor->setEnabled( FALSE );
editor->setWordWrap(TRUE);
editor->setFocus(TRUE);
- editor->setValue(LLSD(mMessage));
+ // editor->setValue(LLSD(mMessage));
+ editor->setValue(mMessage);
return TRUE;
}
@@ -159,7 +161,7 @@ BOOL LLFloaterTOS::postBuild()
// hide the SL text widget if we're displaying TOS with using a browser widget.
LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
- editor->setVisible( FALSE );
+ editor->setVisible(FALSE);
LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
if ( web_browser )
@@ -167,8 +169,8 @@ BOOL LLFloaterTOS::postBuild()
// start to observe it so we see navigate complete events
web_browser->addObserver( this );
- gResponsePtr = LLIamHere::build( this );
- LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
+ gResponsePtr = LLIamHereTOS::build( this );
+ LLHTTPClient::head( getString( "real_url" ), gResponsePtr );
}
return TRUE;
--
cgit v1.1
From caec7837e11523f58d0d322bba883f917db9d2ab Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 6 Oct 2010 17:31:06 -0700
Subject: Changed version to Experimental 2010.10.06-hotfix
---
linden/indra/newview/app_settings/viewerversion.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index e482bf7..555b244 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
<viewer version_patch="0" />
<!--string-->
- <viewer version_test="Experimental 2010.10.02" />
+ <viewer version_test="Experimental 2010.10.06-hotfix" />
</viewer_version>
--
cgit v1.1