diff options
| author | callum <none@none> | 2009-11-30 17:14:37 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-30 17:14:37 -0800 |
| commit | 532a8ed0567878737cfc41ec516dbd1dec76003d (patch) | |
| tree | 622f767dff948bd97b72ac4dbdf722a068d7531b /indra/newview/llpanelmediasettingssecurity.cpp | |
| parent | d90aea0ede0fc6958d6f323a0eae4079f14c46f2 (diff) | |
| parent | 948af3093c93461d11ab6a76a8aab7ea10e377c6 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llpanelmediasettingssecurity.cpp')
| -rw-r--r-- | indra/newview/llpanelmediasettingssecurity.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp index ce49b67899..d87c7608d5 100644 --- a/indra/newview/llpanelmediasettingssecurity.cpp +++ b/indra/newview/llpanelmediasettingssecurity.cpp @@ -191,7 +191,7 @@ void LLPanelMediaSettingsSecurity::preApply() // void LLPanelMediaSettingsSecurity::getValues( LLSD &fill_me_in ) { - fill_me_in[LLMediaEntry::WHITELIST_ENABLE_KEY] = mEnableWhiteList->getValue(); + fill_me_in[LLMediaEntry::WHITELIST_ENABLE_KEY] = (LLSD::Boolean)mEnableWhiteList->getValue(); // iterate over white list and extract items std::vector< LLScrollListItem* > whitelist_items = mWhiteListList->getAllData(); |