summaryrefslogtreecommitdiff
path: root/indra/llui/llview.h
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-25 12:39:46 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-25 12:39:46 -0700
commit3240b188e958fa6232ddb03bc29adb968c7521ac (patch)
tree2ee6663288dd21f03444a435addbb1925dd389e6 /indra/llui/llview.h
parent89ff83d2e7aa6f5af27c3e235b467e5fcd2937a4 (diff)
parent62cd50fe1edd67308cf0a2e5407bd4005e705681 (diff)
Merged from 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)