diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-01 16:55:00 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-01 16:55:00 +0200 |
commit | 6a91f2b7f6b225f86849c9ebe53add6d2c8382a5 (patch) | |
tree | b325606af8716c4ffe9f8d44dea13f47bcec1757 /indra/newview/llpanelmediasettingssecurity.cpp | |
parent | cf3d40462e3c0421884a098505413c00f9004e6a (diff) | |
parent | f893c39a4c92326d7ad08ee4bc79bcc611608ca9 (diff) |
merge
--HG--
branch : product-engine
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 94e137b0f4..7ec53ed57a 100644 --- a/indra/newview/llpanelmediasettingssecurity.cpp +++ b/indra/newview/llpanelmediasettingssecurity.cpp @@ -213,7 +213,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* > white_list_items = mWhiteListList->getAllData(); |