diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-07 16:39:38 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-07 16:39:38 -0800 |
| commit | a07e6c625108988ad664df70a1842b53c843f223 (patch) | |
| tree | ed1816bf0794eca05b06580ea6cbbf2f8f8652b5 /indra/newview/llfloaterauction.cpp | |
| parent | a6ff010dc1bee1b526fd8a83f9ef71d1e51bd082 (diff) | |
| parent | be9bae601cfba3a94dfdcce4a6770cbb328681b6 (diff) | |
Merge branches
Diffstat (limited to 'indra/newview/llfloaterauction.cpp')
| -rw-r--r-- | indra/newview/llfloaterauction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp index 252c7b51ae..c95b046707 100644 --- a/indra/newview/llfloaterauction.cpp +++ b/indra/newview/llfloaterauction.cpp @@ -351,8 +351,8 @@ void LLFloaterAuction::doResetParcel() body["media_height"] = (S32) 0; body["auto_scale"] = (S32) 0; body["media_loop"] = (S32) 0; - body["obscure_media"] = (S32) 0; - body["obscure_music"] = (S32) 0; + body["obscure_media"] = (S32) 0; // OBSOLETE - no longer used + body["obscure_music"] = (S32) 0; // OBSOLETE - no longer used body["media_id"] = LLUUID::null; body["group_id"] = MAINTENANCE_GROUP_ID; // Use maintenance group body["pass_price"] = (S32) 10; // Defaults to $10 |