diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
| commit | 2268bf38339178f93b317693c0a6808807301d64 (patch) | |
| tree | 0a17c21975babce8422b9b62a1683947f5a58f2c /indra/newview/lllocationinputctrl.cpp | |
| parent | d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/lllocationinputctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 8d9d70b50e..5022dba934 100644..100755 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -1217,11 +1217,11 @@ void LLLocationInputCtrl::onParcelIconClick(EParcelIcon icon) case SCRIPTS_ICON: { LLViewerRegion* region = gAgent.getRegion(); - if(region && region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS) + if(region && region->getRegionFlag(REGION_FLAGS_ESTATE_SKIP_SCRIPTS)) { LLNotificationsUtil::add("ScriptsStopped"); } - else if(region && region->getRegionFlags() & REGION_FLAGS_SKIP_SCRIPTS) + else if(region && region->getRegionFlag(REGION_FLAGS_SKIP_SCRIPTS)) { LLNotificationsUtil::add("ScriptsNotRunning"); } |