diff options
| author | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-06-26 13:45:57 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-06-26 13:45:57 -0700 |
| commit | a1a64c35271dae70d482600ced791059f42982c0 (patch) | |
| tree | 862f8f7578ffca2445cd23bbe8e048a9b29197cf /indra/newview/llviewerregion.cpp | |
| parent | 3ce387a04dfa7d1f90b3340770d236b2a168150d (diff) | |
| parent | 1c6783fdb564cb10ade2a585a874ce951fff34e6 (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 8422708add..a4f6340d9e 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1219,7 +1219,7 @@ void LLViewerRegion::getInfo(LLSD& info) info["Region"]["Handle"]["y"] = (LLSD::Integer)y; } -void LLViewerRegion::getSimulatorFeatures(LLSD& sim_features) +void LLViewerRegion::getSimulatorFeatures(LLSD& sim_features) const { sim_features = mSimulatorFeatures; |