diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-10 12:11:22 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-10 12:11:22 -0800 |
| commit | 378585e7f089b62b7a0dd69adde48cd63fc7bacc (patch) | |
| tree | c9f231718b68483a791beb1fb82c90820cd8dc5c /indra/newview/llfloaterauction.cpp | |
| parent | bb57d34cb1db372322f196ba3fd9190a352a71e3 (diff) | |
| parent | e94fa316f34c275d3059808903ea5d8cf24a1ad3 (diff) | |
Merge
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 |