diff options
author | Melanie | 2011-04-06 09:22:55 +0100 |
---|---|---|
committer | Melanie | 2011-04-06 09:22:55 +0100 |
commit | 407c2b182303d3bc1214e71f407bddc28c671a55 (patch) | |
tree | e9658864b8dcad3c2dced73e97b505941576de9b /OpenSim/Framework | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Change some text to make the autoreturn mechanism more obvious, and align wit... (diff) | |
download | opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.zip opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.gz opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.bz2 opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/ILandChannel.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/ILandObject.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/LandData.cs | 67 | ||||
-rw-r--r-- | OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs | 8 |
4 files changed, 5 insertions, 73 deletions
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs index 30bae16..869d4c8 100644 --- a/OpenSim/Framework/ILandChannel.cs +++ b/OpenSim/Framework/ILandChannel.cs | |||
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
77 | /// </param> | 77 | /// </param> |
78 | void Clear(bool setupDefaultParcel); | 78 | void Clear(bool setupDefaultParcel); |
79 | 79 | ||
80 | bool IsLandPrimCountTainted(); | ||
81 | bool IsForcefulBansAllowed(); | 80 | bool IsForcefulBansAllowed(); |
82 | void UpdateLandObject(int localID, LandData data); | 81 | void UpdateLandObject(int localID, LandData data); |
83 | void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient); | 82 | void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient); |
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs index 931e24a..98ea01e 100644 --- a/OpenSim/Framework/ILandObject.cs +++ b/OpenSim/Framework/ILandObject.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Framework | |||
89 | void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client); | 89 | void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client); |
90 | void SendLandObjectOwners(IClientAPI remote_client); | 90 | void SendLandObjectOwners(IClientAPI remote_client); |
91 | void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client); | 91 | void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client); |
92 | void ResetLandPrimCounts(); | 92 | void ResetOverMeRecord(); |
93 | void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area); | 93 | void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area); |
94 | 94 | ||
95 | void DeedToGroup(UUID groupID); | 95 | void DeedToGroup(UUID groupID); |
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 0389a2d..282a128 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -54,12 +54,10 @@ namespace OpenSim.Framework | |||
54 | private int _claimPrice = 0; //Unemplemented | 54 | private int _claimPrice = 0; //Unemplemented |
55 | private UUID _globalID = UUID.Zero; | 55 | private UUID _globalID = UUID.Zero; |
56 | private UUID _groupID = UUID.Zero; | 56 | private UUID _groupID = UUID.Zero; |
57 | private int _groupPrims = 0; | ||
58 | private bool _isGroupOwned = false; | 57 | private bool _isGroupOwned = false; |
59 | private byte[] _bitmap = new byte[512]; | 58 | private byte[] _bitmap = new byte[512]; |
60 | private string _description = String.Empty; | 59 | private string _description = String.Empty; |
61 | 60 | ||
62 | |||
63 | private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark | | 61 | private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark | |
64 | (uint) ParcelFlags.AllowAPrimitiveEntry | | 62 | (uint) ParcelFlags.AllowAPrimitiveEntry | |
65 | (uint) ParcelFlags.AllowDeedToGroup | | 63 | (uint) ParcelFlags.AllowDeedToGroup | |
@@ -72,17 +70,13 @@ namespace OpenSim.Framework | |||
72 | private int _localID = 0; | 70 | private int _localID = 0; |
73 | private byte _mediaAutoScale = 0; | 71 | private byte _mediaAutoScale = 0; |
74 | private UUID _mediaID = UUID.Zero; | 72 | private UUID _mediaID = UUID.Zero; |
75 | |||
76 | private string _mediaURL = String.Empty; | 73 | private string _mediaURL = String.Empty; |
77 | private string _musicURL = String.Empty; | 74 | private string _musicURL = String.Empty; |
78 | private int _otherPrims = 0; | ||
79 | private UUID _ownerID = UUID.Zero; | 75 | private UUID _ownerID = UUID.Zero; |
80 | private int _ownerPrims = 0; | ||
81 | private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); | 76 | private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); |
82 | private float _passHours = 0; | 77 | private float _passHours = 0; |
83 | private int _passPrice = 0; | 78 | private int _passPrice = 0; |
84 | private int _salePrice = 0; //Unemeplemented. Parcels price. | 79 | private int _salePrice = 0; //Unemeplemented. Parcels price. |
85 | private int _selectedPrims = 0; | ||
86 | private int _simwideArea = 0; | 80 | private int _simwideArea = 0; |
87 | private int _simwidePrims = 0; | 81 | private int _simwidePrims = 0; |
88 | private UUID _snapshotID = UUID.Zero; | 82 | private UUID _snapshotID = UUID.Zero; |
@@ -284,19 +278,6 @@ namespace OpenSim.Framework | |||
284 | } | 278 | } |
285 | 279 | ||
286 | /// <summary> | 280 | /// <summary> |
287 | /// Number of SceneObjectPart that are owned by a Group | ||
288 | /// </summary> | ||
289 | [XmlIgnore] | ||
290 | public int GroupPrims { | ||
291 | get { | ||
292 | return _groupPrims; | ||
293 | } | ||
294 | set { | ||
295 | _groupPrims = value; | ||
296 | } | ||
297 | } | ||
298 | |||
299 | /// <summary> | ||
300 | /// Returns true if the Land Parcel is owned by a group | 281 | /// Returns true if the Land Parcel is owned by a group |
301 | /// </summary> | 282 | /// </summary> |
302 | public bool IsGroupOwned { | 283 | public bool IsGroupOwned { |
@@ -454,20 +435,6 @@ namespace OpenSim.Framework | |||
454 | } | 435 | } |
455 | 436 | ||
456 | /// <summary> | 437 | /// <summary> |
457 | /// Number of SceneObjectPart that are owned by users who do not own the parcel | ||
458 | /// and don't have the 'group. These are elegable for AutoReturn collection | ||
459 | /// </summary> | ||
460 | [XmlIgnore] | ||
461 | public int OtherPrims { | ||
462 | get { | ||
463 | return _otherPrims; | ||
464 | } | ||
465 | set { | ||
466 | _otherPrims = value; | ||
467 | } | ||
468 | } | ||
469 | |||
470 | /// <summary> | ||
471 | /// Owner Avatar or Group of the parcel. Naturally, all land masses must be | 438 | /// Owner Avatar or Group of the parcel. Naturally, all land masses must be |
472 | /// owned by someone | 439 | /// owned by someone |
473 | /// </summary> | 440 | /// </summary> |
@@ -481,19 +448,6 @@ namespace OpenSim.Framework | |||
481 | } | 448 | } |
482 | 449 | ||
483 | /// <summary> | 450 | /// <summary> |
484 | /// Number of SceneObjectPart that are owned by the owner of the parcel | ||
485 | /// </summary> | ||
486 | [XmlIgnore] | ||
487 | public int OwnerPrims { | ||
488 | get { | ||
489 | return _ownerPrims; | ||
490 | } | ||
491 | set { | ||
492 | _ownerPrims = value; | ||
493 | } | ||
494 | } | ||
495 | |||
496 | /// <summary> | ||
497 | /// List of access data for the parcel. User data, some bitflags, and a time | 451 | /// List of access data for the parcel. User data, some bitflags, and a time |
498 | /// </summary> | 452 | /// </summary> |
499 | public List<ParcelManager.ParcelAccessEntry> ParcelAccessList { | 453 | public List<ParcelManager.ParcelAccessEntry> ParcelAccessList { |
@@ -542,19 +496,6 @@ namespace OpenSim.Framework | |||
542 | } | 496 | } |
543 | 497 | ||
544 | /// <summary> | 498 | /// <summary> |
545 | /// Number of SceneObjectPart that are currently selected by avatar | ||
546 | /// </summary> | ||
547 | [XmlIgnore] | ||
548 | public int SelectedPrims { | ||
549 | get { | ||
550 | return _selectedPrims; | ||
551 | } | ||
552 | set { | ||
553 | _selectedPrims = value; | ||
554 | } | ||
555 | } | ||
556 | |||
557 | /// <summary> | ||
558 | /// Number of meters^2 in the Simulator | 499 | /// Number of meters^2 in the Simulator |
559 | /// </summary> | 500 | /// </summary> |
560 | [XmlIgnore] | 501 | [XmlIgnore] |
@@ -619,7 +560,7 @@ namespace OpenSim.Framework | |||
619 | } | 560 | } |
620 | 561 | ||
621 | /// <summary> | 562 | /// <summary> |
622 | /// Number of minutes to return SceneObjectGroup that are owned by someone who doesn't own | 563 | /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own |
623 | /// the parcel and isn't set to the same 'group' as the parcel. | 564 | /// the parcel and isn't set to the same 'group' as the parcel. |
624 | /// </summary> | 565 | /// </summary> |
625 | public int OtherCleanTime { | 566 | public int OtherCleanTime { |
@@ -666,10 +607,6 @@ namespace OpenSim.Framework | |||
666 | landData._claimPrice = _claimPrice; | 607 | landData._claimPrice = _claimPrice; |
667 | landData._globalID = _globalID; | 608 | landData._globalID = _globalID; |
668 | landData._groupID = _groupID; | 609 | landData._groupID = _groupID; |
669 | landData._groupPrims = _groupPrims; | ||
670 | landData._otherPrims = _otherPrims; | ||
671 | landData._ownerPrims = _ownerPrims; | ||
672 | landData._selectedPrims = _selectedPrims; | ||
673 | landData._isGroupOwned = _isGroupOwned; | 610 | landData._isGroupOwned = _isGroupOwned; |
674 | landData._localID = _localID; | 611 | landData._localID = _localID; |
675 | landData._landingType = _landingType; | 612 | landData._landingType = _landingType; |
@@ -731,4 +668,4 @@ namespace OpenSim.Framework | |||
731 | return land; | 668 | return land; |
732 | } | 669 | } |
733 | } | 670 | } |
734 | } | 671 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs index 70e87b3..c69c89d 100644 --- a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs +++ b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs | |||
@@ -42,10 +42,7 @@ namespace OpenSim.Framework.Serialization.Tests | |||
42 | private LandData landWithParcelAccessList; | 42 | private LandData landWithParcelAccessList; |
43 | 43 | ||
44 | private static string preSerialized = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n <Area>128</Area>\n <AuctionID>0</AuctionID>\n <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n <Category>10</Category>\n <ClaimDate>0</ClaimDate>\n <ClaimPrice>0</ClaimPrice>\n <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n <IsGroupOwned>False</IsGroupOwned>\n <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n <Description>land data to test LandDataSerializer</Description>\n <Flags>536870944</Flags>\n <LandingType>2</LandingType>\n <Name>LandDataSerializerTest Land</Name>\n <Status>0</Status>\n <LocalID>0</LocalID>\n <MediaAutoScale>1</MediaAutoScale>\n <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n <MusicURL />\n <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n <ParcelAccessList />\n <PassHours>0</PassHours>\n <PassPrice>0</PassPrice>\n <SalePrice>0</SalePrice>\n <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n <UserLocation><0, 0, 0></UserLocation>\n <UserLookAt><0, 0, 0></UserLookAt>\n <Dwell>0</Dwell>\n <OtherCleanTime>0</OtherCleanTime>\n</LandData>"; | 44 | private static string preSerialized = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n <Area>128</Area>\n <AuctionID>0</AuctionID>\n <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n <Category>10</Category>\n <ClaimDate>0</ClaimDate>\n <ClaimPrice>0</ClaimPrice>\n <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n <IsGroupOwned>False</IsGroupOwned>\n <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n <Description>land data to test LandDataSerializer</Description>\n <Flags>536870944</Flags>\n <LandingType>2</LandingType>\n <Name>LandDataSerializerTest Land</Name>\n <Status>0</Status>\n <LocalID>0</LocalID>\n <MediaAutoScale>1</MediaAutoScale>\n <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n <MusicURL />\n <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n <ParcelAccessList />\n <PassHours>0</PassHours>\n <PassPrice>0</PassPrice>\n <SalePrice>0</SalePrice>\n <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n <UserLocation><0, 0, 0></UserLocation>\n <UserLookAt><0, 0, 0></UserLookAt>\n <Dwell>0</Dwell>\n <OtherCleanTime>0</OtherCleanTime>\n</LandData>"; |
45 | private static string preSerializedWithParcelAccessList = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n <Area>128</Area>\n <AuctionID>0</AuctionID>\n <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n <Category>10</Category>\n <ClaimDate>0</ClaimDate>\n <ClaimPrice>0</ClaimPrice>\n <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n <IsGroupOwned>False</IsGroupOwned>\n <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n <Description>land data to test LandDataSerializer</Description>\n <Flags>536870944</Flags>\n <LandingType>2</LandingType>\n <Name>LandDataSerializerTest Land</Name>\n <Status>0</Status>\n <LocalID>0</LocalID>\n <MediaAutoScale>1</MediaAutoScale>\n <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n <MusicURL />\n <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n <ParcelAccessList>\n <ParcelAccessEntry>\n <AgentID>62d65d45-c91a-4f77-862c-46557d978b6c</AgentID>\n <Time>2009-10-01T00:00:00</Time>\n <AccessList>2</AccessList>\n </ParcelAccessEntry>\n <ParcelAccessEntry>\n <AgentID>ec2a8d18-2378-4fe0-8b68-2a31b57c481e</AgentID>\n <Time>2010-10-20T00:00:00</Time>\n <AccessList>1</AccessList>\n </ParcelAccessEntry>\n </ParcelAccessList>\n <PassHours>0</PassHours>\n <PassPrice>0</PassPrice>\n <SalePrice>0</SalePrice>\n <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n <UserLocation><0, 0, 0></UserLocation>\n <UserLookAt><0, 0, 0></UserLookAt>\n <Dwell>0</Dwell>\n <OtherCleanTime>0</OtherCleanTime>\n</LandData>"; | 45 | private static string preSerializedWithParcelAccessList = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n <Area>128</Area>\n <AuctionID>0</AuctionID>\n <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n <Category>10</Category>\n <ClaimDate>0</ClaimDate>\n <ClaimPrice>0</ClaimPrice>\n <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n <IsGroupOwned>False</IsGroupOwned>\n <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n <Description>land data to test LandDataSerializer</Description>\n <Flags>536870944</Flags>\n <LandingType>2</LandingType>\n <Name>LandDataSerializerTest Land</Name>\n <Status>0</Status>\n <LocalID>0</LocalID>\n <MediaAutoScale>1</MediaAutoScale>\n <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n <MusicURL />\n <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n <ParcelAccessList>\n <ParcelAccessEntry>\n <AgentID>62d65d45-c91a-4f77-862c-46557d978b6c</AgentID>\n <Time>2009-10-01T00:00:00</Time>\n <AccessList>2</AccessList>\n </ParcelAccessEntry>\n <ParcelAccessEntry>\n <AgentID>ec2a8d18-2378-4fe0-8b68-2a31b57c481e</AgentID>\n <Time>2010-10-20T00:00:00</Time>\n <AccessList>1</AccessList>\n </ParcelAccessEntry>\n </ParcelAccessList>\n <PassHours>0</PassHours>\n <PassPrice>0</PassPrice>\n <SalePrice>0</SalePrice>\n <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n <UserLocation><0, 0, 0></UserLocation>\n <UserLookAt><0, 0, 0></UserLookAt>\n <Dwell>0</Dwell>\n <OtherCleanTime>0</OtherCleanTime>\n</LandData>"; |
46 | |||
47 | |||
48 | |||
49 | 46 | ||
50 | [SetUp] | 47 | [SetUp] |
51 | public void setup() | 48 | public void setup() |
@@ -62,7 +59,6 @@ namespace OpenSim.Framework.Serialization.Tests | |||
62 | this.land.ClaimPrice = 0; | 59 | this.land.ClaimPrice = 0; |
63 | this.land.GlobalID = new UUID("54ff9641-dd40-4a2c-b1f1-47dd3af24e50"); | 60 | this.land.GlobalID = new UUID("54ff9641-dd40-4a2c-b1f1-47dd3af24e50"); |
64 | this.land.GroupID = new UUID("d740204e-bbbf-44aa-949d-02c7d739f6a5"); | 61 | this.land.GroupID = new UUID("d740204e-bbbf-44aa-949d-02c7d739f6a5"); |
65 | this.land.GroupPrims = 0; | ||
66 | this.land.Description = "land data to test LandDataSerializer"; | 62 | this.land.Description = "land data to test LandDataSerializer"; |
67 | this.land.Flags = (uint)(ParcelFlags.AllowDamage | ParcelFlags.AllowVoiceChat); | 63 | this.land.Flags = (uint)(ParcelFlags.AllowDamage | ParcelFlags.AllowVoiceChat); |
68 | this.land.LandingType = (byte)LandingType.Direct; | 64 | this.land.LandingType = (byte)LandingType.Direct; |
@@ -132,4 +128,4 @@ namespace OpenSim.Framework.Serialization.Tests | |||
132 | "Reified LandData.Name != original LandData.Name (pre-serialized with parcel access list)"); | 128 | "Reified LandData.Name != original LandData.Name (pre-serialized with parcel access list)"); |
133 | } | 129 | } |
134 | } | 130 | } |
135 | } | 131 | } \ No newline at end of file |