diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/llui/llview.h | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 2e1d0e3868..130c3b52f7 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -518,7 +518,7 @@ public: { // need non-const to update private dummy widget cache llwarns << "Making dummy " << xml_tag << " named " << name << " in " << getName() << llendl; - const_cast<LLView*>(this)->mDummyWidgets.insert(std::make_pair(name, widget)); + mDummyWidgets.insert(std::make_pair(name, widget)); } else { @@ -646,7 +646,7 @@ private: std::string mControlName; typedef std::map<std::string, LLView*> dummy_widget_map_t; - dummy_widget_map_t mDummyWidgets; + mutable dummy_widget_map_t mDummyWidgets; boost::signals::connection mControlConnection; |