From fdc848cf72f755b3ce924e12625ec9923495f9bc Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 20 Oct 2009 22:05:00 +0000
Subject: removed unnecessary static variable instantiations to improve compile
 times moved a bunch of template class statics to cpp files also added
 filename parameter to LLXUIParser::readXUI for better debugging of XUI errors

reviewed by James
---
 indra/newview/app_settings/settings.xml    |  4 +--
 indra/newview/llfloateruipreview.cpp       | 53 +++++++++++++++---------------
 indra/newview/llmimetypes.cpp              |  1 +
 indra/newview/llviewerprecompiledheaders.h |  1 -
 indra/newview/llviewertexturelist.cpp      |  2 +-
 5 files changed, 31 insertions(+), 30 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3c7f9292ea..4bfb472b93 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8537,13 +8537,13 @@
     <key>ToolTipVisibleTimeNear</key>
     <map>
       <key>Comment</key>
-      <string>Fade tooltip after after time passes (seconds) while mouse near tooltip</string>
+      <string>Fade tooltip after after time passes (seconds) while mouse near tooltip or original position</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>5.0</real>
+      <real>10.0</real>
     </map>
     <key>ToolTipVisibleTimeOver</key>
     <map>
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index de0b995f8f..ac743df4f1 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -553,32 +553,33 @@ void LLFloaterUIPreview::onLanguageComboSelect(LLUICtrl* ctrl)
 
 void LLFloaterUIPreview::onClickExportSchema()
 {
-	gViewerWindow->setCursor(UI_CURSOR_WAIT);
-	std::string template_path = gDirUtilp->getExpandedFilename(LL_PATH_DEFAULT_SKIN, "xui", "schema");
-
-	typedef LLWidgetTypeRegistry::Registrar::registry_map_t::const_iterator registry_it;
-	registry_it end_it = LLWidgetTypeRegistry::defaultRegistrar().endItems();
-	for(registry_it it = LLWidgetTypeRegistry::defaultRegistrar().beginItems();
-		it != end_it;
-		++it)
-	{
-		std::string widget_name = it->first;
-		const LLInitParam::BaseBlock& block = 
-			(*LLDefaultParamBlockRegistry::instance().getValue(*LLWidgetTypeRegistry::instance().getValue(widget_name)))();
-		LLXMLNodePtr root_nodep = new LLXMLNode();
-		LLRNGWriter().writeRNG(widget_name, root_nodep, block, "http://www.lindenlab.com/xui");
-
-		std::string file_name(template_path + gDirUtilp->getDirDelimiter() + widget_name + ".rng");
-
-		LLFILE* rng_file = LLFile::fopen(file_name.c_str(), "w");
-		{
-			LLXMLNode::writeHeaderToFile(rng_file);
-			const bool use_type_decorations = false;
-			root_nodep->writeToFile(rng_file, std::string(), use_type_decorations);
-		}
-		fclose(rng_file);
-	}
-	gViewerWindow->setCursor(UI_CURSOR_ARROW);
+	//NOTE: schema generation not complete
+	//gViewerWindow->setCursor(UI_CURSOR_WAIT);
+	//std::string template_path = gDirUtilp->getExpandedFilename(LL_PATH_DEFAULT_SKIN, "xui", "schema");
+
+	//typedef LLWidgetTypeRegistry::Registrar::registry_map_t::const_iterator registry_it;
+	//registry_it end_it = LLWidgetTypeRegistry::defaultRegistrar().endItems();
+	//for(registry_it it = LLWidgetTypeRegistry::defaultRegistrar().beginItems();
+	//	it != end_it;
+	//	++it)
+	//{
+	//	std::string widget_name = it->first;
+	//	const LLInitParam::BaseBlock& block = 
+	//		(*LLDefaultParamBlockRegistry::instance().getValue(*LLWidgetTypeRegistry::instance().getValue(widget_name)))();
+	//	LLXMLNodePtr root_nodep = new LLXMLNode();
+	//	LLRNGWriter().writeRNG(widget_name, root_nodep, block, "http://www.lindenlab.com/xui");
+
+	//	std::string file_name(template_path + gDirUtilp->getDirDelimiter() + widget_name + ".rng");
+
+	//	LLFILE* rng_file = LLFile::fopen(file_name.c_str(), "w");
+	//	{
+	//		LLXMLNode::writeHeaderToFile(rng_file);
+	//		const bool use_type_decorations = false;
+	//		root_nodep->writeToFile(rng_file, std::string(), use_type_decorations);
+	//	}
+	//	fclose(rng_file);
+	//}
+	//gViewerWindow->setCursor(UI_CURSOR_ARROW);
 }
 
 void LLFloaterUIPreview::onClickShowRectangles(const LLSD& data)
diff --git a/indra/newview/llmimetypes.cpp b/indra/newview/llmimetypes.cpp
index 525e89cdff..235487cf46 100644
--- a/indra/newview/llmimetypes.cpp
+++ b/indra/newview/llmimetypes.cpp
@@ -34,6 +34,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llmimetypes.h"
+#include "llxmlnode.h"
 
 #include "lluictrlfactory.h"
 
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index 21d4c72428..bb317aeb5f 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -105,7 +105,6 @@
 #include "llstl.h"
 #include "llstrider.h"
 #include "llstring.h"
-#include "llstringtable.h"
 #include "llsys.h"
 #include "llthread.h"
 #include "lltimer.h"
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index dac2331ca3..4ad4c8e1ea 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1474,7 +1474,7 @@ bool LLUIImageList::initFromFile()
 	}
 
 	UIImageDeclarations images;
-	LLXUIParser::instance().readXUI(root, images);
+	LLXUIParser::instance().readXUI(root, images, base_file_path);
 
 	if (!images.validateBlock()) return false;
 
-- 
cgit v1.2.3