summaryrefslogtreecommitdiff
path: root/indra/llui/llview.h
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-06-25 08:55:46 -0400
committerKent Quirk <q@lindenlab.com>2010-06-25 08:55:46 -0400
commit7aa6fd235d96fc1394b98eb48ad94471b6d5b4c9 (patch)
tree9e00a401da8db6457051da2612423b1eeedd061a /indra/llui/llview.h
parent23706afa6431e34f821baa925ada220b06833a97 (diff)
parentc77efc92e3ebcb9af9bb997e5b709484153844d4 (diff)
Merge from q/viewer-release
Diffstat (limited to 'indra/llui/llview.h')
-rw-r--r--indra/llui/llview.h4
1 files changed, 3 insertions, 1 deletions
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)