diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
| commit | f64a20ddcff91677b02b7688e08819cffb0989c9 (patch) | |
| tree | 707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/llfloaterauction.cpp | |
| parent | c077250ff16aeaf0ec4c036154a427c677e85eb3 (diff) | |
| parent | 17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff) | |
merge changes for storm-1016
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 |