diff options
author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llinventory/llparcel.cpp | |
parent | Second Life viewer sources 1.14.0.1 (diff) | |
download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz |
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/llinventory/llparcel.cpp')
-rw-r--r-- | linden/indra/llinventory/llparcel.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp index b4faf7c..c37a4d6 100644 --- a/linden/indra/llinventory/llparcel.cpp +++ b/linden/indra/llinventory/llparcel.cpp | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -192,7 +193,6 @@ void LLParcel::init(const LLUUID &owner_id, | |||
192 | mRecordTransaction = FALSE; | 193 | mRecordTransaction = FALSE; |
193 | 194 | ||
194 | mAuctionID = 0; | 195 | mAuctionID = 0; |
195 | mIsReservedForNewbie = FALSE; | ||
196 | mInEscrow = false; | 196 | mInEscrow = false; |
197 | 197 | ||
198 | mParcelFlags = PF_DEFAULT; | 198 | mParcelFlags = PF_DEFAULT; |
@@ -652,10 +652,6 @@ BOOL LLParcel::importStream(std::istream& input_stream) | |||
652 | { | 652 | { |
653 | LLString::convertToU32(value, mAuctionID); | 653 | LLString::convertToU32(value, mAuctionID); |
654 | } | 654 | } |
655 | else if("reserved_newbie" == keyword) | ||
656 | { | ||
657 | LLString::convertToBOOL(value, mIsReservedForNewbie); | ||
658 | } | ||
659 | else if ("allow_modify" == keyword) | 655 | else if ("allow_modify" == keyword) |
660 | { | 656 | { |
661 | LLString::convertToU32(value, setting); | 657 | LLString::convertToU32(value, setting); |
@@ -1090,10 +1086,6 @@ BOOL LLParcel::exportStream(std::ostream& output_stream) | |||
1090 | { | 1086 | { |
1091 | output_stream << "\t\t auction_id " << mAuctionID << "\n"; | 1087 | output_stream << "\t\t auction_id " << mAuctionID << "\n"; |
1092 | } | 1088 | } |
1093 | if(mIsReservedForNewbie) | ||
1094 | { | ||
1095 | output_stream << "\t\t reserved_newbie " << mIsReservedForNewbie << "\n"; | ||
1096 | } | ||
1097 | 1089 | ||
1098 | output_stream << "\t\t allow_modify " << getAllowModify() << "\n"; | 1090 | output_stream << "\t\t allow_modify " << getAllowModify() << "\n"; |
1099 | output_stream << "\t\t allow_group_modify " << getAllowGroupModify() << "\n"; | 1091 | output_stream << "\t\t allow_group_modify " << getAllowGroupModify() << "\n"; |
@@ -1634,7 +1626,6 @@ void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id) | |||
1634 | setSellWithObjects(FALSE); | 1626 | setSellWithObjects(FALSE); |
1635 | type = TRANS_LAND_RELEASE; | 1627 | type = TRANS_LAND_RELEASE; |
1636 | mStatus = OS_NONE; | 1628 | mStatus = OS_NONE; |
1637 | mIsReservedForNewbie = FALSE; | ||
1638 | flags = pack_transaction_flags(mGroupOwned, FALSE); | 1629 | flags = pack_transaction_flags(mGroupOwned, FALSE); |
1639 | mAuthBuyerID.setNull(); | 1630 | mAuthBuyerID.setNull(); |
1640 | from_id = mOwnerID; | 1631 | from_id = mOwnerID; |
@@ -1652,7 +1643,6 @@ void LLParcel::completeSale(U32& type, U8& flags, | |||
1652 | flags = pack_transaction_flags(mGroupOwned, mGroupOwned); | 1643 | flags = pack_transaction_flags(mGroupOwned, mGroupOwned); |
1653 | to_id = mOwnerID; | 1644 | to_id = mOwnerID; |
1654 | mAuthBuyerID.setNull(); | 1645 | mAuthBuyerID.setNull(); |
1655 | mIsReservedForNewbie = FALSE; | ||
1656 | 1646 | ||
1657 | // Purchased parcels are assumed to no longer be for sale. | 1647 | // Purchased parcels are assumed to no longer be for sale. |
1658 | // Otherwise someone can snipe the sale. | 1648 | // Otherwise someone can snipe the sale. |
@@ -1685,7 +1675,6 @@ void LLParcel::clearSale() | |||
1685 | setPreviousOwnerID(LLUUID::null); | 1675 | setPreviousOwnerID(LLUUID::null); |
1686 | setPreviouslyGroupOwned(FALSE); | 1676 | setPreviouslyGroupOwned(FALSE); |
1687 | setSellWithObjects(FALSE); | 1677 | setSellWithObjects(FALSE); |
1688 | mIsReservedForNewbie = FALSE; | ||
1689 | } | 1678 | } |
1690 | 1679 | ||
1691 | BOOL LLParcel::isPublic() const | 1680 | BOOL LLParcel::isPublic() const |
@@ -1719,7 +1708,6 @@ void LLParcel::clearParcel() | |||
1719 | setUserLookAt(LLVector3::x_axis); | 1708 | setUserLookAt(LLVector3::x_axis); |
1720 | setLandingType(L_LANDING_POINT); | 1709 | setLandingType(L_LANDING_POINT); |
1721 | setAuctionID(0); | 1710 | setAuctionID(0); |
1722 | setReservedForNewbie(FALSE); | ||
1723 | setGroupID(LLUUID::null); | 1711 | setGroupID(LLUUID::null); |
1724 | setPassPrice(0); | 1712 | setPassPrice(0); |
1725 | setPassHours(0.f); | 1713 | setPassHours(0.f); |