From 87458cd714cd5b12057b8f61dfc8000df176458f Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 30 Jun 2011 19:12:27 +0300
Subject: SH-1725 WIP Fixed model wizard making multiple calls to upload
 permissions check. Fixed truncated warning text.

---
 indra/newview/llfloatermodelwizard.cpp                      | 8 ++------
 indra/newview/llfloatermodelwizard.h                        | 2 --
 indra/newview/skins/default/xui/en/floater_model_wizard.xml | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp
index f0e4e99d82..254c54ad2a 100644
--- a/indra/newview/llfloatermodelwizard.cpp
+++ b/indra/newview/llfloatermodelwizard.cpp
@@ -412,12 +412,6 @@ BOOL LLFloaterModelWizard::handleScrollWheel(S32 x, S32 y, S32 clicks)
 }
 
 
-/*virtual*/
-void LLFloaterModelWizard::onOpen(const LLSD& key)
-{
-	requestAgentUploadPermissions();
-}
-
 void LLFloaterModelWizard::initDecompControls()
 {
 	LLSD key;
@@ -654,6 +648,8 @@ BOOL LLFloaterModelWizard::postBuild()
 
 	initDecompControls();
 
+	requestAgentUploadPermissions();
+
 	return TRUE;
 }
 
diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h
index 6821e8b908..7057189f86 100644
--- a/indra/newview/llfloatermodelwizard.h
+++ b/indra/newview/llfloatermodelwizard.h
@@ -65,8 +65,6 @@ public:
 	BOOL handleHover(S32 x, S32 y, MASK mask);
 	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
 
-	/*virtual*/ void onOpen(const LLSD& key);
-
 	void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost);
 	void modelLoadedCallback();
 	void modelChangedCallback();
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 9e1bd9c349..b5a5ff5342 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -264,14 +264,14 @@
                 WARNING:
             </text>
             <text
-             height="40"
+             height="50"
              left="10"
              name="warning_text"
              top_pad="0"
              visible="false"
              width="320"
              word_wrap="true">
-                You will not be able to complete the final step of uploading this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to set up y
+                You will not be able to complete the final step of uploading this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to set up your account for mesh model uploads. 
             </text>
 		</panel>
 	</panel>
-- 
cgit v1.2.3