diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-10 13:40:36 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-10 13:40:36 -0500 |
commit | 57c5d474013793f622ac77a139251a54b056cb00 (patch) | |
tree | 8cd490d3bb86e74bfcd701ee400bccda74791629 /indra/newview/llfloaterauction.cpp | |
parent | d3ca4983a4526c7fcf9eb9609e007ded74c47c05 (diff) | |
parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) |
pull 2.5.1 tag back from viewer-release
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 |