diff options
author | Melanie Thielker | 2010-09-05 14:16:42 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-09-05 14:16:42 +0200 |
commit | e5936071711e35f9edf44d8393b8ad28ef4023db (patch) | |
tree | 72677e380cfcea4921eb910a93a1b985a4a4d6d1 /OpenSim | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-e5936071711e35f9edf44d8393b8ad28ef4023db.zip opensim-SC_OLD-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.gz opensim-SC_OLD-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.bz2 opensim-SC_OLD-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.xz |
Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/LandData.cs | 14 | ||||
-rw-r--r-- | OpenSim/Framework/Serialization/External/LandDataSerializer.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | 109 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/LandSnapshot.cs | 7 |
10 files changed, 69 insertions, 103 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index 7ff8737..77b8a10 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |||
@@ -638,9 +638,9 @@ ELSE | |||
638 | 638 | ||
639 | //Insert new values | 639 | //Insert new values |
640 | string sql = @"INSERT INTO [land] | 640 | string sql = @"INSERT INTO [land] |
641 | ([UUID],[RegionUUID],[LocalLandID],[Bitmap],[Name],[Description],[OwnerUUID],[IsGroupOwned],[Area],[AuctionID],[Category],[ClaimDate],[ClaimPrice],[GroupUUID],[SalePrice],[LandStatus],[LandFlags],[LandingType],[MediaAutoScale],[MediaTextureUUID],[MediaURL],[MusicURL],[PassHours],[PassPrice],[SnapshotUUID],[UserLocationX],[UserLocationY],[UserLocationZ],[UserLookAtX],[UserLookAtY],[UserLookAtZ],[AuthbuyerID],[OtherCleanTime],[Dwell]) | 641 | ([UUID],[RegionUUID],[LocalLandID],[Bitmap],[Name],[Description],[OwnerUUID],[IsGroupOwned],[Area],[AuctionID],[Category],[ClaimDate],[ClaimPrice],[GroupUUID],[SalePrice],[LandStatus],[LandFlags],[LandingType],[MediaAutoScale],[MediaTextureUUID],[MediaURL],[MusicURL],[PassHours],[PassPrice],[SnapshotUUID],[UserLocationX],[UserLocationY],[UserLocationZ],[UserLookAtX],[UserLookAtY],[UserLookAtZ],[AuthbuyerID],[OtherCleanTime]) |
642 | VALUES | 642 | VALUES |
643 | (@UUID,@RegionUUID,@LocalLandID,@Bitmap,@Name,@Description,@OwnerUUID,@IsGroupOwned,@Area,@AuctionID,@Category,@ClaimDate,@ClaimPrice,@GroupUUID,@SalePrice,@LandStatus,@LandFlags,@LandingType,@MediaAutoScale,@MediaTextureUUID,@MediaURL,@MusicURL,@PassHours,@PassPrice,@SnapshotUUID,@UserLocationX,@UserLocationY,@UserLocationZ,@UserLookAtX,@UserLookAtY,@UserLookAtZ,@AuthbuyerID,@OtherCleanTime,@Dwell)"; | 643 | (@UUID,@RegionUUID,@LocalLandID,@Bitmap,@Name,@Description,@OwnerUUID,@IsGroupOwned,@Area,@AuctionID,@Category,@ClaimDate,@ClaimPrice,@GroupUUID,@SalePrice,@LandStatus,@LandFlags,@LandingType,@MediaAutoScale,@MediaTextureUUID,@MediaURL,@MusicURL,@PassHours,@PassPrice,@SnapshotUUID,@UserLocationX,@UserLocationY,@UserLocationZ,@UserLookAtX,@UserLookAtY,@UserLookAtZ,@AuthbuyerID,@OtherCleanTime)"; |
644 | 644 | ||
645 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 645 | using (SqlConnection conn = new SqlConnection(m_connectionString)) |
646 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 646 | using (SqlCommand cmd = new SqlCommand(sql, conn)) |
@@ -954,7 +954,6 @@ VALUES | |||
954 | newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]); | 954 | newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]); |
955 | 955 | ||
956 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 956 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
957 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
958 | 957 | ||
959 | try | 958 | try |
960 | { | 959 | { |
@@ -1357,7 +1356,6 @@ VALUES | |||
1357 | parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z)); | 1356 | parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z)); |
1358 | parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID)); | 1357 | parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID)); |
1359 | parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime)); | 1358 | parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime)); |
1360 | parameters.Add(_Database.CreateParameter("Dwell", land.Dwell)); | ||
1361 | 1359 | ||
1362 | return parameters.ToArray(); | 1360 | return parameters.ToArray(); |
1363 | } | 1361 | } |
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 04446ce..30253c3 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -677,7 +677,7 @@ namespace OpenSim.Data.MySQL | |||
677 | "MusicURL, PassHours, PassPrice, SnapshotUUID, " + | 677 | "MusicURL, PassHours, PassPrice, SnapshotUUID, " + |
678 | "UserLocationX, UserLocationY, UserLocationZ, " + | 678 | "UserLocationX, UserLocationY, UserLocationZ, " + |
679 | "UserLookAtX, UserLookAtY, UserLookAtZ, " + | 679 | "UserLookAtX, UserLookAtY, UserLookAtZ, " + |
680 | "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " + | 680 | "AuthbuyerID, OtherCleanTime, MediaType, MediaDescription, " + |
681 | "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + | 681 | "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + |
682 | "?UUID, ?RegionUUID, " + | 682 | "?UUID, ?RegionUUID, " + |
683 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + | 683 | "?LocalLandID, ?Bitmap, ?Name, ?Description, " + |
@@ -688,7 +688,7 @@ namespace OpenSim.Data.MySQL | |||
688 | "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + | 688 | "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + |
689 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + | 689 | "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + |
690 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + | 690 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + |
691 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell, ?MediaType, ?MediaDescription, "+ | 691 | "?AuthbuyerID, ?OtherCleanTime, ?MediaType, ?MediaDescription, "+ |
692 | "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; | 692 | "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; |
693 | 693 | ||
694 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); | 694 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); |
@@ -1329,7 +1329,6 @@ namespace OpenSim.Data.MySQL | |||
1329 | UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer); | 1329 | UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer); |
1330 | UUID.TryParse((string)row["SnapshotUUID"], out snapshotID); | 1330 | UUID.TryParse((string)row["SnapshotUUID"], out snapshotID); |
1331 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 1331 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
1332 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
1333 | 1332 | ||
1334 | newData.AuthBuyerID = authedbuyer; | 1333 | newData.AuthBuyerID = authedbuyer; |
1335 | newData.SnapshotID = snapshotID; | 1334 | newData.SnapshotID = snapshotID; |
@@ -1660,7 +1659,6 @@ namespace OpenSim.Data.MySQL | |||
1660 | cmd.Parameters.AddWithValue("UserLookAtZ", land.UserLookAt.Z); | 1659 | cmd.Parameters.AddWithValue("UserLookAtZ", land.UserLookAt.Z); |
1661 | cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); | 1660 | cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); |
1662 | cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); | 1661 | cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); |
1663 | cmd.Parameters.AddWithValue("Dwell", land.Dwell); | ||
1664 | cmd.Parameters.AddWithValue("MediaDescription", land.MediaDescription); | 1662 | cmd.Parameters.AddWithValue("MediaDescription", land.MediaDescription); |
1665 | cmd.Parameters.AddWithValue("MediaType", land.MediaType); | 1663 | cmd.Parameters.AddWithValue("MediaType", land.MediaType); |
1666 | cmd.Parameters.AddWithValue("MediaWidth", land.MediaWidth); | 1664 | cmd.Parameters.AddWithValue("MediaWidth", land.MediaWidth); |
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 8432e74..88699a7 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -1111,7 +1111,6 @@ namespace OpenSim.Data.SQLite | |||
1111 | createCol(land, "UserLookAtZ", typeof (Double)); | 1111 | createCol(land, "UserLookAtZ", typeof (Double)); |
1112 | createCol(land, "AuthbuyerID", typeof(String)); | 1112 | createCol(land, "AuthbuyerID", typeof(String)); |
1113 | createCol(land, "OtherCleanTime", typeof(Int32)); | 1113 | createCol(land, "OtherCleanTime", typeof(Int32)); |
1114 | createCol(land, "Dwell", typeof(Int32)); | ||
1115 | 1114 | ||
1116 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; | 1115 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; |
1117 | 1116 | ||
@@ -1449,7 +1448,6 @@ namespace OpenSim.Data.SQLite | |||
1449 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); | 1448 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); |
1450 | 1449 | ||
1451 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 1450 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
1452 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
1453 | 1451 | ||
1454 | return newData; | 1452 | return newData; |
1455 | } | 1453 | } |
@@ -1761,7 +1759,6 @@ namespace OpenSim.Data.SQLite | |||
1761 | row["UserLookAtZ"] = land.UserLookAt.Z; | 1759 | row["UserLookAtZ"] = land.UserLookAt.Z; |
1762 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); | 1760 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); |
1763 | row["OtherCleanTime"] = land.OtherCleanTime; | 1761 | row["OtherCleanTime"] = land.OtherCleanTime; |
1764 | row["Dwell"] = land.Dwell; | ||
1765 | row["MediaType"] = land.MediaType; | 1762 | row["MediaType"] = land.MediaType; |
1766 | row["MediaDescription"] = land.MediaDescription; | 1763 | row["MediaDescription"] = land.MediaDescription; |
1767 | row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString(); | 1764 | row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString(); |
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs index 289fd94..b5ce4c0 100644 --- a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs | |||
@@ -1069,7 +1069,6 @@ namespace OpenSim.Data.SQLiteLegacy | |||
1069 | createCol(land, "UserLookAtZ", typeof (Double)); | 1069 | createCol(land, "UserLookAtZ", typeof (Double)); |
1070 | createCol(land, "AuthbuyerID", typeof(String)); | 1070 | createCol(land, "AuthbuyerID", typeof(String)); |
1071 | createCol(land, "OtherCleanTime", typeof(Int32)); | 1071 | createCol(land, "OtherCleanTime", typeof(Int32)); |
1072 | createCol(land, "Dwell", typeof(Int32)); | ||
1073 | 1072 | ||
1074 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; | 1073 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; |
1075 | 1074 | ||
@@ -1400,7 +1399,6 @@ namespace OpenSim.Data.SQLiteLegacy | |||
1400 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); | 1399 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); |
1401 | 1400 | ||
1402 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | 1401 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); |
1403 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
1404 | 1402 | ||
1405 | return newData; | 1403 | return newData; |
1406 | } | 1404 | } |
@@ -1711,7 +1709,6 @@ namespace OpenSim.Data.SQLiteLegacy | |||
1711 | row["UserLookAtZ"] = land.UserLookAt.Z; | 1709 | row["UserLookAtZ"] = land.UserLookAt.Z; |
1712 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); | 1710 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); |
1713 | row["OtherCleanTime"] = land.OtherCleanTime; | 1711 | row["OtherCleanTime"] = land.OtherCleanTime; |
1714 | row["Dwell"] = land.Dwell; | ||
1715 | } | 1712 | } |
1716 | 1713 | ||
1717 | /// <summary> | 1714 | /// <summary> |
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 4440c94..5bb0413 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -88,7 +88,6 @@ namespace OpenSim.Framework | |||
88 | private UUID _snapshotID = UUID.Zero; | 88 | private UUID _snapshotID = UUID.Zero; |
89 | private Vector3 _userLocation = new Vector3(); | 89 | private Vector3 _userLocation = new Vector3(); |
90 | private Vector3 _userLookAt = new Vector3(); | 90 | private Vector3 _userLookAt = new Vector3(); |
91 | private int _dwell = 0; | ||
92 | private int _otherCleanTime = 0; | 91 | private int _otherCleanTime = 0; |
93 | private string _mediaType = "none/none"; | 92 | private string _mediaType = "none/none"; |
94 | private string _mediaDescription = ""; | 93 | private string _mediaDescription = ""; |
@@ -620,18 +619,6 @@ namespace OpenSim.Framework | |||
620 | } | 619 | } |
621 | 620 | ||
622 | /// <summary> | 621 | /// <summary> |
623 | /// Deprecated idea. Number of visitors ~= free money | ||
624 | /// </summary> | ||
625 | public int Dwell { | ||
626 | get { | ||
627 | return _dwell; | ||
628 | } | ||
629 | set { | ||
630 | _dwell = value; | ||
631 | } | ||
632 | } | ||
633 | |||
634 | /// <summary> | ||
635 | /// Number of minutes to return SceneObjectGroup that are owned by someone who doesn't own | 622 | /// Number of minutes to return SceneObjectGroup that are owned by someone who doesn't own |
636 | /// the parcel and isn't set to the same 'group' as the parcel. | 623 | /// the parcel and isn't set to the same 'group' as the parcel. |
637 | /// </summary> | 624 | /// </summary> |
@@ -703,7 +690,6 @@ namespace OpenSim.Framework | |||
703 | landData._userLocation = _userLocation; | 690 | landData._userLocation = _userLocation; |
704 | landData._userLookAt = _userLookAt; | 691 | landData._userLookAt = _userLookAt; |
705 | landData._otherCleanTime = _otherCleanTime; | 692 | landData._otherCleanTime = _otherCleanTime; |
706 | landData._dwell = _dwell; | ||
707 | landData._mediaType = _mediaType; | 693 | landData._mediaType = _mediaType; |
708 | landData._mediaDescription = _mediaDescription; | 694 | landData._mediaDescription = _mediaDescription; |
709 | landData._mediaWidth = _mediaWidth; | 695 | landData._mediaWidth = _mediaWidth; |
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs index ff0afc8..fc0387b 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |||
@@ -118,7 +118,8 @@ namespace OpenSim.Framework.Serialization.External | |||
118 | landData.SnapshotID = UUID.Parse( xtr.ReadElementString("SnapshotID")); | 118 | landData.SnapshotID = UUID.Parse( xtr.ReadElementString("SnapshotID")); |
119 | landData.UserLocation = Vector3.Parse( xtr.ReadElementString("UserLocation")); | 119 | landData.UserLocation = Vector3.Parse( xtr.ReadElementString("UserLocation")); |
120 | landData.UserLookAt = Vector3.Parse( xtr.ReadElementString("UserLookAt")); | 120 | landData.UserLookAt = Vector3.Parse( xtr.ReadElementString("UserLookAt")); |
121 | landData.Dwell = Convert.ToInt32( xtr.ReadElementString("Dwell")); | 121 | // No longer used here |
122 | xtr.ReadElementString("Dwell"); | ||
122 | landData.OtherCleanTime = Convert.ToInt32( xtr.ReadElementString("OtherCleanTime")); | 123 | landData.OtherCleanTime = Convert.ToInt32( xtr.ReadElementString("OtherCleanTime")); |
123 | 124 | ||
124 | xtr.ReadEndElement(); | 125 | xtr.ReadEndElement(); |
@@ -177,7 +178,7 @@ namespace OpenSim.Framework.Serialization.External | |||
177 | xtw.WriteElementString("SnapshotID", landData.SnapshotID.ToString()); | 178 | xtw.WriteElementString("SnapshotID", landData.SnapshotID.ToString()); |
178 | xtw.WriteElementString("UserLocation", landData.UserLocation.ToString()); | 179 | xtw.WriteElementString("UserLocation", landData.UserLocation.ToString()); |
179 | xtw.WriteElementString("UserLookAt", landData.UserLookAt.ToString()); | 180 | xtw.WriteElementString("UserLookAt", landData.UserLookAt.ToString()); |
180 | xtw.WriteElementString("Dwell", Convert.ToString(landData.Dwell)); | 181 | xtw.WriteElementString("Dwell", "0"); |
181 | xtw.WriteElementString("OtherCleanTime", Convert.ToString(landData.OtherCleanTime)); | 182 | xtw.WriteElementString("OtherCleanTime", Convert.ToString(landData.OtherCleanTime)); |
182 | 183 | ||
183 | xtw.WriteEndElement(); | 184 | xtw.WriteEndElement(); |
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs index f955df7..41ece86 100644 --- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs +++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | |||
@@ -57,80 +57,73 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
57 | { | 57 | { |
58 | WebRequest request = WebRequest.Create(requestUrl); | 58 | WebRequest request = WebRequest.Create(requestUrl); |
59 | request.Method = verb; | 59 | request.Method = verb; |
60 | string respstring = String.Empty; | ||
60 | 61 | ||
61 | if ((verb == "POST") || (verb == "PUT")) | 62 | using (MemoryStream buffer = new MemoryStream()) |
62 | { | 63 | { |
63 | request.ContentType = "text/www-form-urlencoded"; | 64 | if ((verb == "POST") || (verb == "PUT")) |
64 | |||
65 | MemoryStream buffer = new MemoryStream(); | ||
66 | int length = 0; | ||
67 | using (StreamWriter writer = new StreamWriter(buffer)) | ||
68 | { | 65 | { |
69 | writer.Write(obj); | 66 | request.ContentType = "text/www-form-urlencoded"; |
70 | writer.Flush(); | ||
71 | } | ||
72 | 67 | ||
73 | length = (int)obj.Length; | 68 | int length = 0; |
74 | request.ContentLength = length; | 69 | using (StreamWriter writer = new StreamWriter(buffer)) |
70 | { | ||
71 | writer.Write(obj); | ||
72 | writer.Flush(); | ||
73 | } | ||
75 | 74 | ||
76 | Stream requestStream = null; | 75 | length = (int)obj.Length; |
77 | try | 76 | request.ContentLength = length; |
78 | { | ||
79 | requestStream = request.GetRequestStream(); | ||
80 | requestStream.Write(buffer.ToArray(), 0, length); | ||
81 | } | ||
82 | catch (Exception e) | ||
83 | { | ||
84 | m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: " + e.ToString(), requestUrl); | ||
85 | } | ||
86 | finally | ||
87 | { | ||
88 | // If this is closed, it will be disposed internally, | ||
89 | // but the above write is asynchronous and may hit after | ||
90 | // we're through here. So the thread handling that will | ||
91 | // throw and put us back into the catch above. Isn't | ||
92 | // .NET great? | ||
93 | //if (requestStream != null) | ||
94 | // requestStream.Close(); | ||
95 | // Let's not close this | ||
96 | //buffer.Close(); | ||
97 | 77 | ||
78 | Stream requestStream = null; | ||
79 | try | ||
80 | { | ||
81 | requestStream = request.GetRequestStream(); | ||
82 | requestStream.Write(buffer.ToArray(), 0, length); | ||
83 | } | ||
84 | catch (Exception e) | ||
85 | { | ||
86 | m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: " + e.ToString(), requestUrl); | ||
87 | } | ||
88 | finally | ||
89 | { | ||
90 | if (requestStream != null) | ||
91 | requestStream.Close(); | ||
92 | } | ||
98 | } | 93 | } |
99 | } | ||
100 | |||
101 | string respstring = String.Empty; | ||
102 | 94 | ||
103 | try | 95 | try |
104 | { | ||
105 | using (WebResponse resp = request.GetResponse()) | ||
106 | { | 96 | { |
107 | if (resp.ContentLength != 0) | 97 | using (WebResponse resp = request.GetResponse()) |
108 | { | 98 | { |
109 | Stream respStream = null; | 99 | if (resp.ContentLength != 0) |
110 | try | ||
111 | { | 100 | { |
112 | respStream = resp.GetResponseStream(); | 101 | Stream respStream = null; |
113 | using (StreamReader reader = new StreamReader(respStream)) | 102 | try |
114 | { | 103 | { |
115 | respstring = reader.ReadToEnd(); | 104 | respStream = resp.GetResponseStream(); |
105 | using (StreamReader reader = new StreamReader(respStream)) | ||
106 | { | ||
107 | respstring = reader.ReadToEnd(); | ||
108 | } | ||
109 | } | ||
110 | catch (Exception e) | ||
111 | { | ||
112 | m_log.DebugFormat("[FORMS]: exception occured on receiving reply " + e.ToString()); | ||
113 | } | ||
114 | finally | ||
115 | { | ||
116 | if (respStream != null) | ||
117 | respStream.Close(); | ||
116 | } | 118 | } |
117 | } | ||
118 | catch (Exception e) | ||
119 | { | ||
120 | m_log.DebugFormat("[FORMS]: exception occured on receiving reply " + e.ToString()); | ||
121 | } | ||
122 | finally | ||
123 | { | ||
124 | if (respStream != null) | ||
125 | respStream.Close(); | ||
126 | } | 119 | } |
127 | } | 120 | } |
128 | } | 121 | } |
129 | } | 122 | catch (System.InvalidOperationException) |
130 | catch (System.InvalidOperationException) | 123 | { |
131 | { | 124 | // This is what happens when there is invalid XML |
132 | // This is what happens when there is invalid XML | 125 | m_log.DebugFormat("[FORMS]: InvalidOperationException on receiving request"); |
133 | m_log.DebugFormat("[FORMS]: InvalidOperationException on receiving request"); | 126 | } |
134 | } | 127 | } |
135 | return respstring; | 128 | return respstring; |
136 | } | 129 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a1cd30a..3dea40c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2687,6 +2687,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2687 | 2687 | ||
2688 | public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) | 2688 | public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) |
2689 | { | 2689 | { |
2690 | float dwell = 0.0f; | ||
2691 | IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>(); | ||
2692 | if (dwellModule != null) | ||
2693 | dwell = dwellModule.GetDwell(land.GlobalID); | ||
2690 | ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); | 2694 | ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); |
2691 | reply.AgentData.AgentID = m_agentId; | 2695 | reply.AgentData.AgentID = m_agentId; |
2692 | reply.Data.ParcelID = parcelID; | 2696 | reply.Data.ParcelID = parcelID; |
@@ -2711,7 +2715,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2711 | reply.Data.GlobalZ = pos.Z; | 2715 | reply.Data.GlobalZ = pos.Z; |
2712 | reply.Data.SimName = Utils.StringToBytes(info.RegionName); | 2716 | reply.Data.SimName = Utils.StringToBytes(info.RegionName); |
2713 | reply.Data.SnapshotID = land.SnapshotID; | 2717 | reply.Data.SnapshotID = land.SnapshotID; |
2714 | reply.Data.Dwell = land.Dwell; | 2718 | reply.Data.Dwell = dwell; |
2715 | reply.Data.SalePrice = land.SalePrice; | 2719 | reply.Data.SalePrice = land.SalePrice; |
2716 | reply.Data.AuctionID = (int)land.AuctionID; | 2720 | reply.Data.AuctionID = (int)land.AuctionID; |
2717 | 2721 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 776fe30..040dc8c 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -171,7 +171,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
171 | client.OnParcelGodForceOwner += ClientOnParcelGodForceOwner; | 171 | client.OnParcelGodForceOwner += ClientOnParcelGodForceOwner; |
172 | client.OnParcelReclaim += ClientOnParcelReclaim; | 172 | client.OnParcelReclaim += ClientOnParcelReclaim; |
173 | client.OnParcelInfoRequest += ClientOnParcelInfoRequest; | 173 | client.OnParcelInfoRequest += ClientOnParcelInfoRequest; |
174 | // client.OnParcelDwellRequest += ClientOnParcelDwellRequest; | ||
175 | client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; | 174 | client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; |
176 | client.OnPreAgentUpdate += ClientOnPreAgentUpdate; | 175 | client.OnPreAgentUpdate += ClientOnPreAgentUpdate; |
177 | 176 | ||
@@ -1512,18 +1511,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1512 | 1511 | ||
1513 | #endregion | 1512 | #endregion |
1514 | 1513 | ||
1515 | private void ClientOnParcelDwellRequest(int localID, IClientAPI remoteClient) | ||
1516 | { | ||
1517 | ILandObject selectedParcel = null; | ||
1518 | lock (m_landList) | ||
1519 | { | ||
1520 | if (!m_landList.TryGetValue(localID, out selectedParcel)) | ||
1521 | return; | ||
1522 | } | ||
1523 | |||
1524 | remoteClient.SendParcelDwellReply(localID, selectedParcel.LandData.GlobalID, selectedParcel.LandData.Dwell); | ||
1525 | } | ||
1526 | |||
1527 | private void ClientOnParcelInfoRequest(IClientAPI remoteClient, UUID parcelID) | 1514 | private void ClientOnParcelInfoRequest(IClientAPI remoteClient, UUID parcelID) |
1528 | { | 1515 | { |
1529 | if (parcelID == UUID.Zero) | 1516 | if (parcelID == UUID.Zero) |
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 64d29f2..b8c90cd 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs | |||
@@ -123,6 +123,8 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
123 | ILandChannel landChannel = m_scene.LandChannel; | 123 | ILandChannel landChannel = m_scene.LandChannel; |
124 | List<ILandObject> parcels = landChannel.AllParcels(); | 124 | List<ILandObject> parcels = landChannel.AllParcels(); |
125 | 125 | ||
126 | IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>(); | ||
127 | |||
126 | XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "parceldata", ""); | 128 | XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "parceldata", ""); |
127 | if (parcels != null) | 129 | if (parcels != null) |
128 | { | 130 | { |
@@ -208,7 +210,10 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
208 | xmlparcel.AppendChild(infouuid); | 210 | xmlparcel.AppendChild(infouuid); |
209 | 211 | ||
210 | XmlNode dwell = nodeFactory.CreateNode(XmlNodeType.Element, "dwell", ""); | 212 | XmlNode dwell = nodeFactory.CreateNode(XmlNodeType.Element, "dwell", ""); |
211 | dwell.InnerText = parcel.Dwell.ToString(); | 213 | if (dwellModule != null) |
214 | dwell.InnerText = dwellModule.GetDwell(parcel.GlobalID).ToString(); | ||
215 | else | ||
216 | dwell.InnerText = "0"; | ||
212 | xmlparcel.AppendChild(dwell); | 217 | xmlparcel.AppendChild(dwell); |
213 | 218 | ||
214 | //TODO: figure how to figure out teleport system landData.landingType | 219 | //TODO: figure how to figure out teleport system landData.landingType |