diff options
author | Don Kjer <don@lindenlab.com> | 2011-03-08 01:36:15 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-03-08 01:36:15 +0000 |
commit | 127c45dfbab4550ebd7074f131e3a7b844affea8 (patch) | |
tree | 4e53a71899f03bd8de1028231f025c7355df7f11 /indra/newview/llfloaterauction.cpp | |
parent | cb7ae391efed1cadab621734c6eb53fd62df19a4 (diff) | |
parent | a07e6c625108988ad664df70a1842b53c843f223 (diff) |
Merge with viewer-development
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 |