diff options
| author | Richard Linden <none@none> | 2012-07-02 22:51:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-02 22:51:14 -0700 |
| commit | 092bb735645db448b55716754e6d0057ebc42ebf (patch) | |
| tree | a3d620b24693be4362674c02bc912f1393cf4d61 /indra/llui/lluictrlfactory.h | |
| parent | f22e5df8b6890aab659916361d42479ca3825be9 (diff) | |
| parent | 062cae9a4880f7672df7f6189e01b2bff15f42f1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
| -rw-r--r-- | indra/llui/lluictrlfactory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index d612ad5005..b441cb0c9d 100644 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -105,7 +105,7 @@ private: ParamDefaults() { // look up template file for this param block... - const std::string* param_block_tag = getWidgetTag(&typeid(PARAM_BLOCK)); + const std::string* param_block_tag = getWidgetName(&typeid(PARAM_BLOCK)); if (param_block_tag) { // ...and if it exists, back fill values using the most specific template first PARAM_BLOCK params; @@ -303,7 +303,7 @@ private: } - static const std::string* getWidgetTag(const std::type_info* widget_type); + static const std::string* getWidgetName(const std::type_info* widget_type); // this exists to get around dependency on llview static void setCtrlParent(LLView* view, LLView* parent, S32 tab_group); |