diff options
| author | Richard Linden <none@none> | 2010-06-22 13:42:55 -0700 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-22 13:42:55 -0700 | 
| commit | 7a54ce3cf686d872425c3230b305156b83a36b26 (patch) | |
| tree | 4a5c774d61bd81f497adbb21abdf28859e97a026 /indra/llui | |
| parent | a42cf03807385c214118298821d532f5b6b4d984 (diff) | |
EXT-7729 WIP  LLWARNS: Tons of "Making dummy class..." warnings on startup
reviewed by Leyla
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/llfloater.h | 2 | ||||
| -rw-r--r-- | indra/llui/lluictrlfactory.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llview.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llview.h | 4 | 
5 files changed, 9 insertions, 5 deletions
| diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 9a56372e68..39a6855273 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2754,10 +2754,10 @@ void LLFloater::initFromParams(const LLFloater::Params& p)  LLFastTimer::DeclareTimer POST_BUILD("Floater Post Build"); -bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node) +bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node)  {  	Params params(LLUICtrlFactory::getDefaultParams<LLFloater>()); -	LLXUIParser::instance().readXUI(node, params); // *TODO: Error checking +	LLXUIParser::instance().readXUI(node, params, filename); // *TODO: Error checking  	if (output_node)  	{ diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 654164ddc0..3ea035777c 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -149,7 +149,7 @@ public:  	static void setupParamsForExport(Params& p, LLView* parent);  	void initFromParams(const LLFloater::Params& p); -	bool initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL); +	bool initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node = NULL);  	/*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);  	/*virtual*/ BOOL canSnapTo(const LLView* other_view); diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index 930dadc377..4dd155f8e5 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -222,7 +222,7 @@ bool LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filen  		floaterp->getCommitCallbackRegistrar().pushScope();  		floaterp->getEnableCallbackRegistrar().pushScope(); -		res = floaterp->initFloaterXML(root, floaterp->getParent(), output_node); +		res = floaterp->initFloaterXML(root, floaterp->getParent(), filename, output_node);  		floaterp->setXMLFilename(filename); diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index bd56da9121..394ec957d5 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -111,6 +111,8 @@ LLView::Params::Params()  	user_resize("user_resize"),  	auto_resize("auto_resize"),  	needs_translate("translate"), +	min_width("min_width"), +	max_width("max_width"),  	xmlns("xmlns"),  	xmlns_xsi("xmlns:xsi"),  	xsi_schemaLocation("xsi:schemaLocation"), diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 3779fedf34..9ff6a4e1a0 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -148,6 +148,8 @@ public:  		Ignored						user_resize,  									auto_resize,  									needs_translate, +									min_width, +									max_width,  									xmlns,  									xmlns_xsi,  									xsi_schemaLocation, @@ -634,7 +636,7 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) co  		// did we find *something* with that name?  		if (child)  		{ -			llwarns << "Found child named " << name << " but of wrong type " << typeid(*child).name() << ", expecting " << typeid(T*).name() << llendl; +			llwarns << "Found child named \"" << name << "\" but of wrong type " << typeid(*child).name() << ", expecting " << typeid(T*).name() << llendl;  		}  		result = getDefaultWidget<T>(name);  		if (!result) | 
