diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-28 13:58:00 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-28 13:58:00 +0200 |
commit | 14caf5475b8963e6b6689e96a0a7a64e13bb1887 (patch) | |
tree | 8d08ab19e287fca6a07622560669573fb9750181 /indra/newview/llpanellandmarkinfo.cpp | |
parent | 33a417dd2d93573f7aafc194eefdad5339bccf1d (diff) | |
parent | 52bd13e1f5cd661ff359e36be8c0496d06c19d1c (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanellandmarkinfo.cpp')
-rw-r--r-- | indra/newview/llpanellandmarkinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp index c792fd4fe3..7a17d4a1f0 100644 --- a/indra/newview/llpanellandmarkinfo.cpp +++ b/indra/newview/llpanellandmarkinfo.cpp @@ -108,7 +108,7 @@ void LLPanelLandmarkInfo::resetLocation() } // virtual -void LLPanelLandmarkInfo::setInfoType(INFO_TYPE type) +void LLPanelLandmarkInfo::setInfoType(EInfoType type) { LLPanel* landmark_info_panel = getChild<LLPanel>("landmark_info_panel"); |