10 files changed, 73 insertions, 36 deletions

diff --git a/linden/indra/lib/python/indra/util/fastest_elementtree.py b/linden/indra/lib/python/indra/util/fastest_elementtree.py
index 3e2189c..0e92545 100644
--- a/linden/indra/lib/python/indra/util/fastest_elementtree.py
+++ b/linden/indra/lib/python/indra/util/fastest_elementtree.py
@@ -43,6 +43,7 @@ try:
     if not use_celementree:
         raise ImportError()
     # Python 2.3 and 2.4.
+    from cElementTree import fromstring # this isn't in old versions of cElementTree
     from cElementTree import *
     ElementTreeError = SyntaxError
 except ImportError:
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index dab6c1d..3545309 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -358,7 +358,9 @@ static unsigned get_till_eol(std::istream& input, char *buf, unsigned bufsize)
                 char c = input.get();
                 buf[count++] = c;
                 if (is_eol(c))
+                {
                         break;
+                }
         }
         return count;
 }
@@ -391,14 +393,36 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
 
                 if (status == XML_STATUS_ERROR)
                 {
-                        std::string error_string( XML_ErrorString(XML_GetErrorCode( mParser )));
-                        if ("parsing aborted" != error_string )//end of input
+                        std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser )));
+                        if (input.gcount() == 0)
+                        {
+                                // nothing to do -- MC
+                                data = LLSD();
+                                return LLSDParser::PARSE_FAILURE;
+                        }
+                        else if (error_string != "parsing aborted") // end of input
                         {
                                 S32 line_number = XML_GetCurrentLineNumber( mParser );
-                                llwarns << "LLXmlTree parse failed.  Line " << line_number << ": " 
-                                        << error_string << llendl;
+                                // This parses LLCurl::Responder::completedRaw always, even
+                                // when not using XML. We have to do this little ugliness 
+                                // in order to make this error message meaningful.
+                                // See Expat's xmlparse.c for the full list of errors -- MC
+                                if (error_string == "not well-formed (invalid token)")
+                                {
+                                        std::string text((char*)buffer);
+                                        if ((text.find('>') != std::string::npos) ||
+                                                (text.find('<') != std::string::npos))
+                                        {
+                                                llwarns << "LLSDXMLParser::Impl::parse error.  Line " << line_number << ": " 
+                                                                << error_string << llendl;
+                                        }
+                                        break;
+                                }
+                                
+                                llinfos << "Possible LLSDXMLParser::Impl::parse error.  Line " << line_number << ": " 
+                                                << error_string << llendl;
                         }
-
+                        // Always break here -- MC
                         break;
                 }
         }
@@ -417,14 +441,13 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
                         ((char*) buffer)[count ? count - 1 : 0] = '\0';
                 }
 
-
                 data = LLSD();
                 return LLSDParser::PARSE_FAILURE;
         }
 
         clear_eol(input);
         data = mResult;
-        return mParseCount;
+        return mParseCount; // why return mParseCount?! -- MC
 }
 
 
@@ -499,7 +522,7 @@ S32 LLSDXMLParser::Impl::parseLines(std::istream& input, LLSD& data)
                 if ("parsing aborted" != error_string )//end of input
                 {
                         S32 line_number = XML_GetCurrentLineNumber( mParser );
-                        llwarns << "LLXmlTree parse failed.  Line " << line_number << ": " 
+                        llwarns << "LLSDXMLParser::Impl::parseLines failed.  Line " << line_number << ": " 
                                 << error_string << llendl;
                 }
                 return LLSDParser::PARSE_FAILURE;
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index def847b..f3715c4 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -53,7 +53,7 @@
                                                         <!--<string>AudioEngine</string>-->
                                                         <!--<string>BodyPhysics</string>-->
               <!--<string>InitInfo</string>-->
-              <string>Inventory</string>
+              <!--<string>Inventory</string>-->
               <!--<string>isOwnedSelf</string>-->
                                                         <!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
diff --git a/linden/indra/newview/floatervoicelicense.cpp b/linden/indra/newview/floatervoicelicense.cpp
index c780ff3..b7814e7 100644
--- a/linden/indra/newview/floatervoicelicense.cpp
+++ b/linden/indra/newview/floatervoicelicense.cpp
@@ -114,10 +114,6 @@ BOOL FloaterVoiceLicense::postBuild()
         childSetAction("Cancel", onCancel, this);
         childSetCommitCallback("agree_chk", updateAgree, this);
 
-        // disable Agree to License radio button until the page has fully loaded
-        LLCheckBoxCtrl* license_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-        license_agreement->setEnabled( false );
-
         // hide the SL text widget if we're displaying license with using a browser widget.
         LLTextEditor *editor = getChild<LLTextEditor>("license_text");
         editor->setVisible( FALSE );
@@ -159,8 +155,7 @@ void FloaterVoiceLicense::setSiteIsAlive( bool alive )
         {
                 // normally this is set when navigation to license page completes (so you can't accept before it loads)
                 // but if the page is unavailable, we need to do this now
-                LLCheckBoxCtrl* license_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-                license_agreement->setEnabled( true );
+                // We used to enable "agree_chk" checkbox here too -- MC
         }
 }
 
@@ -234,9 +229,8 @@ void FloaterVoiceLicense::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaE
                 if ( ++mLoadCompleteCount == 2 )
                 {
                         llinfos << "NAVIGATE COMPLETE" << llendl;
-                        // enable Agree to License radio button now that page has loaded
-                        LLCheckBoxCtrl * license_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-                        license_agreement->setEnabled( true );
+                        // We used to enable Agree to License radio button now that page has loaded here
+                        // but this is event is horribly broken -- MC
                 }
         }
 }
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 0e8e816..cb52ee0 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -42,6 +42,7 @@
 #include "llkeyboard.h"
 #include "llmodaldialog.h"
 #include "llviewercontrol.h"
+#include "llvoiceclient.h"
 #include "lluictrlfactory.h"
 
 
@@ -150,7 +151,7 @@ void LLPrefsVoice::apply()
         }
 
         bool enable_voice = childGetValue("enable_voice_check");
-        if (enable_voice && !gSavedSettings.getBOOL("VivoxLicenseAccepted"))
+        if (enable_voice && LLVoiceClient::needsVivoxLicense())
         {
                 // This window enables voice chat if license is accepted
                 FloaterVoiceLicense::getInstance()->open();
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 08e12ce..922de18 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1161,19 +1161,24 @@ bool idle_startup()
                 // color init must be after saved settings loaded
                 init_colors();
 
-                if (!gSavedSettings.getBOOL("EnableVoiceChat") ||
-                        (gSavedSettings.getBOOL("EnableVoiceChat") && gSavedSettings.getBOOL("VivoxLicenseAccepted")) || 
-                        !gHippoGridManager->getConnectedGrid()->isSecondLife())
+                // skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it
+                // skipping over STATE_UPDATE_CHECK because that just waits for input
+                // We don't do this on non-SL grids either
+                if (LLVoiceClient::needsVivoxLicense())
                 {
-                        // skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it
-                        // skipping over STATE_UPDATE_CHECK because that just waits for input
-                        // We don't do this on non-SL grids either
-                        LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
+                        if (gSavedSettings.getBOOL("EnableVoiceChat"))
+                        {
+                                LLStartUp::setStartupState(STATE_LOGIN_VOICE_LICENSE);
+                                LLFirstUse::voiceLicenseAgreement();
+                        }
+                        else
+                        {
+                                LLStartUp::setStartupState(STATE_LOGIN_AUTH_INIT);
+                        }
                 }
                 else
                 {
-                        LLStartUp::setStartupState(STATE_LOGIN_VOICE_LICENSE);
-                        LLFirstUse::voiceLicenseAgreement();
+                        LLStartUp::setStartupState(STATE_LOGIN_AUTH_INIT);
                 }
 
                 return FALSE;
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 3cf15fc..2035b62 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -58,11 +58,13 @@
 #include "llimview.h" // for LLIMMgr
 #include "llimpanel.h" // for LLVoiceChannel
 #include "llparcel.h"
+#include "llstartup.h"
 #include "llviewerparcelmgr.h"
 #include "llfirstuse.h"
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
 #include "hippolimits.h"
+#include "hippogridmanager.h"
 
 #include "llfloaterfriends.h"  //VIVOX, inorder to refresh communicate panel
 #include "llfloaterchat.h"              // for LLFloaterChat::addChat()
@@ -76,6 +78,7 @@
 // for MD5 hash
 #include "llmd5.h"
 
+
 #define USE_SESSION_GROUPS 0
 
 static bool sConnectingToAgni = false;
@@ -7164,6 +7167,15 @@ void LLVoiceClient::avatarNameResolved(const LLUUID &id, const std::string &name
         }
 }
 
+//static 
+bool LLVoiceClient::needsVivoxLicense()
+{
+        // assumes we're always using slvoice.exe on Second Life
+        bool needs_license = !gSavedSettings.getBOOL("VivoxLicenseAccepted") && 
+                                                gHippoGridManager->getCurrentGrid()->isSecondLife();
+        return needs_license;
+}
+
 class LLViewerParcelVoiceInfo : public LLHTTPNode
 {
         virtual void post(
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index f5c6d87..250f4cb 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -87,6 +87,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
         public:
                 static void init(LLPumpIO *pump);       // Call this once at application startup (creates connector)
                 static void terminate();        // Call this to clean up during shutdown
+                static bool needsVivoxLicense();
                                                 
         protected:
                 bool writeString(const std::string &str);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml b/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
index c97c4f7..b691282 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="false" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="500" min_height="100" min_width="100"
+<floater can_close="false" can_drag_on_left="true" can_minimize="false"
+     can_resize="true" height="500" min_height="300" min_width="400"
      name="modal container" title="" width="600">
   <button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
-             label="Continue" label_selected="Continue" left="484" mouse_opaque="true"
-             name="Continue" width="100" />
+             label="Continue" label_selected="Continue" right="-16" mouse_opaque="true"
+             name="Continue" follows="right|bottom" width="100" />
   <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
-             width="100" />
-  <check_box bottom="-435" follows="top|right"
+             follows="left|bottom" width="100" />
+  <check_box bottom="-435" follows="bottom|left"
              font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of the Vivox Acceptable Use Policy"
              left="16" mouse_opaque="true" name="agree_chk" width="55" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -25,7 +25,7 @@ To use Vivox voice chat, you must agree to the terms of the policy.
     LICENSE_TEXT
   </text_editor>
   <!-- Loading text says: "Loading Vivox Acceptable Use Policy..." URL encoded -->
-  <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
+  <web_browser bottom="-406" embedded_items="false" follows="left|top|right|bottom" font="SansSerif"
              height="340" left="16" max_length="65536" mouse_opaque="true"
              name="license_html"
              start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Acceptable%20Use%20Policy%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 5e4bd39..05e6b31 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -100,7 +100,7 @@
                bottom_delta="-20" left_delta="0" height="20" width="250"
                follows="left|bottom" font="SansSerif"
                bevel_style="in" border_style="line" border_thickness="1"
-               max_length="31" mouse_opaque="true"
+               max_length="63" mouse_opaque="true"
                handle_edit_keys_directly="true"
                select_all_on_focus_received="true"
                allow_translate="false" />