aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/Console/CommandConsole.cs2
-rw-r--r--OpenSim/Framework/Console/LocalConsole.cs18
-rw-r--r--OpenSim/Framework/LandData.cs28
-rw-r--r--OpenSim/Framework/LandUpdateArgs.cs14
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs74
-rw-r--r--OpenSim/Framework/RegionInfo.cs28
-rw-r--r--OpenSim/Framework/Serialization/ArchiveConstants.cs20
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs121
9 files changed, 152 insertions, 155 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 8a339fe..6f32adf 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -760,7 +760,7 @@ namespace OpenSim.Framework.Capabilities
760 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); 760 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
761 761
762 BakedTextureUploader uploader = 762 BakedTextureUploader uploader =
763 new BakedTextureUploader( capsBase + uploaderPath, 763 new BakedTextureUploader(capsBase + uploaderPath,
764 m_httpListener); 764 m_httpListener);
765 uploader.OnUpLoad += BakedTextureUploaded; 765 uploader.OnUpLoad += BakedTextureUploaded;
766 766
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index b17dbc0..52bcd55 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Framework.Console
151 help.Add(commandInfo.descriptive_help); 151 help.Add(commandInfo.descriptive_help);
152 152
153 if (descriptiveHelp != string.Empty) 153 if (descriptiveHelp != string.Empty)
154 help.Add(string.Empty); 154 help.Add(string.Empty);
155 } 155 }
156 else 156 else
157 { 157 {
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index c968031..6043094 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Console
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// A console that uses cursor control and color 40 /// A console that uses cursor control and color
41 /// </summary> 41 /// </summary>
42 public class LocalConsole : CommandConsole 42 public class LocalConsole : CommandConsole
43 { 43 {
44// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -100,8 +100,8 @@ namespace OpenSim.Framework.Console
100 private int SetCursorTop(int top) 100 private int SetCursorTop(int top)
101 { 101 {
102 // From at least mono 2.4.2.3, window resizing can give mono an invalid row and column values. If we try 102 // From at least mono 2.4.2.3, window resizing can give mono an invalid row and column values. If we try
103 // to set a cursor row position with a currently invalid column, mono will throw an exception. 103 // to set a cursor row position with a currently invalid column, mono will throw an exception.
104 // Therefore, we need to make sure that the column position is valid first. 104 // Therefore, we need to make sure that the column position is valid first.
105 int left = System.Console.CursorLeft; 105 int left = System.Console.CursorLeft;
106 106
107 if (left < 0) 107 if (left < 0)
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Console
121 { 121 {
122 top = 0; 122 top = 0;
123 } 123 }
124 else 124 else
125 { 125 {
126 int bh = System.Console.BufferHeight; 126 int bh = System.Console.BufferHeight;
127 127
@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Console
133 System.Console.CursorTop = top; 133 System.Console.CursorTop = top;
134 134
135 return top; 135 return top;
136 } 136 }
137 137
138 /// <summary> 138 /// <summary>
139 /// Set the cursor column. 139 /// Set the cursor column.
@@ -145,12 +145,12 @@ namespace OpenSim.Framework.Console
145 /// </param> 145 /// </param>
146 /// <returns> 146 /// <returns>
147 /// The new cursor column. 147 /// The new cursor column.
148 /// </returns> 148 /// </returns>
149 private int SetCursorLeft(int left) 149 private int SetCursorLeft(int left)
150 { 150 {
151 // From at least mono 2.4.2.3, window resizing can give mono an invalid row and column values. If we try 151 // From at least mono 2.4.2.3, window resizing can give mono an invalid row and column values. If we try
152 // to set a cursor column position with a currently invalid row, mono will throw an exception. 152 // to set a cursor column position with a currently invalid row, mono will throw an exception.
153 // Therefore, we need to make sure that the row position is valid first. 153 // Therefore, we need to make sure that the row position is valid first.
154 int top = System.Console.CursorTop; 154 int top = System.Console.CursorTop;
155 155
156 if (top < 0) 156 if (top < 0)
@@ -214,7 +214,7 @@ namespace OpenSim.Framework.Console
214 System.Console.Write("{0}", prompt); 214 System.Console.Write("{0}", prompt);
215 215
216 SetCursorTop(new_y); 216 SetCursorTop(new_y);
217 SetCursorLeft(new_x); 217 SetCursorLeft(new_x);
218 } 218 }
219 } 219 }
220 220
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 8d3266b..accf52e 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -89,13 +89,13 @@ namespace OpenSim.Framework
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 _otherCleanTime = 0; 91 private int _otherCleanTime = 0;
92 private string _mediaType = "none/none"; 92 private string _mediaType = "none/none";
93 private string _mediaDescription = ""; 93 private string _mediaDescription = "";
94 private int _mediaHeight = 0; 94 private int _mediaHeight = 0;
95 private int _mediaWidth = 0; 95 private int _mediaWidth = 0;
96 private bool _mediaLoop = false; 96 private bool _mediaLoop = false;
97 private bool _obscureMusic = false; 97 private bool _obscureMusic = false;
98 private bool _obscureMedia = false; 98 private bool _obscureMedia = false;
99 99
100 /// <summary> 100 /// <summary>
101 /// Whether to obscure parcel media URL 101 /// Whether to obscure parcel media URL
@@ -690,13 +690,13 @@ namespace OpenSim.Framework
690 landData._userLocation = _userLocation; 690 landData._userLocation = _userLocation;
691 landData._userLookAt = _userLookAt; 691 landData._userLookAt = _userLookAt;
692 landData._otherCleanTime = _otherCleanTime; 692 landData._otherCleanTime = _otherCleanTime;
693 landData._mediaType = _mediaType; 693 landData._mediaType = _mediaType;
694 landData._mediaDescription = _mediaDescription; 694 landData._mediaDescription = _mediaDescription;
695 landData._mediaWidth = _mediaWidth; 695 landData._mediaWidth = _mediaWidth;
696 landData._mediaHeight = _mediaHeight; 696 landData._mediaHeight = _mediaHeight;
697 landData._mediaLoop = _mediaLoop; 697 landData._mediaLoop = _mediaLoop;
698 landData._obscureMusic = _obscureMusic; 698 landData._obscureMusic = _obscureMusic;
699 landData._obscureMedia = _obscureMedia; 699 landData._obscureMedia = _obscureMedia;
700 700
701 landData._parcelAccessList.Clear(); 701 landData._parcelAccessList.Clear();
702 foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList) 702 foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)
diff --git a/OpenSim/Framework/LandUpdateArgs.cs b/OpenSim/Framework/LandUpdateArgs.cs
index ed496a1..7d6c4f2 100644
--- a/OpenSim/Framework/LandUpdateArgs.cs
+++ b/OpenSim/Framework/LandUpdateArgs.cs
@@ -49,12 +49,12 @@ namespace OpenSim.Framework
49 public UUID SnapshotID; 49 public UUID SnapshotID;
50 public Vector3 UserLocation; 50 public Vector3 UserLocation;
51 public Vector3 UserLookAt; 51 public Vector3 UserLookAt;
52 public string MediaType; 52 public string MediaType;
53 public string MediaDescription; 53 public string MediaDescription;
54 public int MediaHeight; 54 public int MediaHeight;
55 public int MediaWidth; 55 public int MediaWidth;
56 public bool MediaLoop; 56 public bool MediaLoop;
57 public bool ObscureMusic; 57 public bool ObscureMusic;
58 public bool ObscureMedia; 58 public bool ObscureMedia;
59 } 59 }
60} 60}
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 70a61cc..0a81363 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Framework
175 } 175 }
176 } 176 }
177 } 177 }
178 178
179 /// <summary> 179 /// <summary>
180 /// Entries to store media textures on each face 180 /// Entries to store media textures on each face
181 /// </summary> 181 /// </summary>
@@ -1216,28 +1216,28 @@ namespace OpenSim.Framework
1216 prim.Properties.Permissions = new Permissions(); 1216 prim.Properties.Permissions = new Permissions();
1217 prim.Properties.SalePrice = 10; 1217 prim.Properties.SalePrice = 10;
1218 prim.Properties.SaleType = new SaleType(); 1218 prim.Properties.SaleType = new SaleType();
1219 1219
1220 return prim; 1220 return prim;
1221 } 1221 }
1222 1222
1223 /// <summary> 1223 /// <summary>
1224 /// Encapsulates a list of media entries. 1224 /// Encapsulates a list of media entries.
1225 /// </summary> 1225 /// </summary>
1226 /// This class is necessary because we want to replace auto-serialization of MediaEntry with something more 1226 /// This class is necessary because we want to replace auto-serialization of MediaEntry with something more
1227 /// OSD like and less vulnerable to change. 1227 /// OSD like and less vulnerable to change.
1228 public class MediaList : List<MediaEntry>, IXmlSerializable 1228 public class MediaList : List<MediaEntry>, IXmlSerializable
1229 { 1229 {
1230 public const string MEDIA_TEXTURE_TYPE = "sl"; 1230 public const string MEDIA_TEXTURE_TYPE = "sl";
1231 1231
1232 public MediaList() : base() {} 1232 public MediaList() : base() {}
1233 public MediaList(IEnumerable<MediaEntry> collection) : base(collection) {} 1233 public MediaList(IEnumerable<MediaEntry> collection) : base(collection) {}
1234 public MediaList(int capacity) : base(capacity) {} 1234 public MediaList(int capacity) : base(capacity) {}
1235 1235
1236 public XmlSchema GetSchema() 1236 public XmlSchema GetSchema()
1237 { 1237 {
1238 return null; 1238 return null;
1239 } 1239 }
1240 1240
1241 public string ToXml() 1241 public string ToXml()
1242 { 1242 {
1243 lock (this) 1243 lock (this)
@@ -1245,78 +1245,78 @@ namespace OpenSim.Framework
1245 using (StringWriter sw = new StringWriter()) 1245 using (StringWriter sw = new StringWriter())
1246 { 1246 {
1247 using (XmlTextWriter xtw = new XmlTextWriter(sw)) 1247 using (XmlTextWriter xtw = new XmlTextWriter(sw))
1248 { 1248 {
1249 xtw.WriteStartElement("OSMedia"); 1249 xtw.WriteStartElement("OSMedia");
1250 xtw.WriteAttributeString("type", MEDIA_TEXTURE_TYPE); 1250 xtw.WriteAttributeString("type", MEDIA_TEXTURE_TYPE);
1251 xtw.WriteAttributeString("version", "0.1"); 1251 xtw.WriteAttributeString("version", "0.1");
1252 1252
1253 OSDArray meArray = new OSDArray(); 1253 OSDArray meArray = new OSDArray();
1254 foreach (MediaEntry me in this) 1254 foreach (MediaEntry me in this)
1255 { 1255 {
1256 OSD osd = (null == me ? new OSD() : me.GetOSD()); 1256 OSD osd = (null == me ? new OSD() : me.GetOSD());
1257 meArray.Add(osd); 1257 meArray.Add(osd);
1258 } 1258 }
1259 1259
1260 xtw.WriteStartElement("OSData"); 1260 xtw.WriteStartElement("OSData");
1261 xtw.WriteRaw(OSDParser.SerializeLLSDXmlString(meArray)); 1261 xtw.WriteRaw(OSDParser.SerializeLLSDXmlString(meArray));
1262 xtw.WriteEndElement(); 1262 xtw.WriteEndElement();
1263 1263
1264 xtw.WriteEndElement(); 1264 xtw.WriteEndElement();
1265 1265
1266 xtw.Flush(); 1266 xtw.Flush();
1267 return sw.ToString(); 1267 return sw.ToString();
1268 } 1268 }
1269 } 1269 }
1270 } 1270 }
1271 } 1271 }
1272 1272
1273 public void WriteXml(XmlWriter writer) 1273 public void WriteXml(XmlWriter writer)
1274 { 1274 {
1275 writer.WriteRaw(ToXml()); 1275 writer.WriteRaw(ToXml());
1276 } 1276 }
1277 1277
1278 public static MediaList FromXml(string rawXml) 1278 public static MediaList FromXml(string rawXml)
1279 { 1279 {
1280 MediaList ml = new MediaList(); 1280 MediaList ml = new MediaList();
1281 ml.ReadXml(rawXml); 1281 ml.ReadXml(rawXml);
1282 return ml; 1282 return ml;
1283 } 1283 }
1284 1284
1285 public void ReadXml(string rawXml) 1285 public void ReadXml(string rawXml)
1286 { 1286 {
1287 using (StringReader sr = new StringReader(rawXml)) 1287 using (StringReader sr = new StringReader(rawXml))
1288 { 1288 {
1289 using (XmlTextReader xtr = new XmlTextReader(sr)) 1289 using (XmlTextReader xtr = new XmlTextReader(sr))
1290 { 1290 {
1291 xtr.MoveToContent(); 1291 xtr.MoveToContent();
1292 1292
1293 string type = xtr.GetAttribute("type"); 1293 string type = xtr.GetAttribute("type");
1294 //m_log.DebugFormat("[MOAP]: Loaded media texture entry with type {0}", type); 1294 //m_log.DebugFormat("[MOAP]: Loaded media texture entry with type {0}", type);
1295 1295
1296 if (type != MEDIA_TEXTURE_TYPE) 1296 if (type != MEDIA_TEXTURE_TYPE)
1297 return; 1297 return;
1298 1298
1299 xtr.ReadStartElement("OSMedia"); 1299 xtr.ReadStartElement("OSMedia");
1300 1300
1301 OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml()); 1301 OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml());
1302 foreach (OSD osdMe in osdMeArray) 1302 foreach (OSD osdMe in osdMeArray)
1303 { 1303 {
1304 MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry()); 1304 MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
1305 Add(me); 1305 Add(me);
1306 } 1306 }
1307 1307
1308 xtr.ReadEndElement(); 1308 xtr.ReadEndElement();
1309 } 1309 }
1310 } 1310 }
1311 } 1311 }
1312 1312
1313 public void ReadXml(XmlReader reader) 1313 public void ReadXml(XmlReader reader)
1314 { 1314 {
1315 if (reader.IsEmptyElement) 1315 if (reader.IsEmptyElement)
1316 return; 1316 return;
1317 1317
1318 ReadXml(reader.ReadInnerXml()); 1318 ReadXml(reader.ReadInnerXml());
1319 } 1319 }
1320 } 1320 }
1321 } 1321 }
1322} \ No newline at end of file 1322}
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 12c58c3..08d5398 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -97,9 +97,9 @@ namespace OpenSim.Framework
97 97
98 [Serializable] 98 [Serializable]
99 public class SimpleRegionInfo 99 public class SimpleRegionInfo
100 { 100 {
101// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 101// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
102 102
103 /// <summary> 103 /// <summary>
104 /// The port by which http communication occurs with the region (most noticeably, CAPS communication) 104 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
105 /// </summary> 105 /// </summary>
@@ -344,7 +344,7 @@ namespace OpenSim.Framework
344 public string proxyUrl = ""; 344 public string proxyUrl = "";
345 public int ProxyOffset = 0; 345 public int ProxyOffset = 0;
346 public string regionSecret = UUID.Random().ToString(); 346 public string regionSecret = UUID.Random().ToString();
347 347
348 public string osSecret; 348 public string osSecret;
349 349
350 public UUID lastMapUUID = UUID.Zero; 350 public UUID lastMapUUID = UUID.Zero;
@@ -699,7 +699,7 @@ namespace OpenSim.Framework
699 699
700 RegionID = new UUID(regionUUID); 700 RegionID = new UUID(regionUUID);
701 originRegionID = RegionID; // What IS this?! 701 originRegionID = RegionID; // What IS this?!
702 702
703 RegionName = name; 703 RegionName = name;
704 string location = config.GetString("Location", String.Empty); 704 string location = config.GetString("Location", String.Empty);
705 705
@@ -720,7 +720,7 @@ namespace OpenSim.Framework
720 720
721 // Internal IP 721 // Internal IP
722 IPAddress address; 722 IPAddress address;
723 723
724 if (config.Contains("InternalAddress")) 724 if (config.Contains("InternalAddress"))
725 { 725 {
726 address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty)); 726 address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty));
@@ -774,7 +774,7 @@ namespace OpenSim.Framework
774 { 774 {
775 m_externalHostName = Util.GetLocalHost().ToString(); 775 m_externalHostName = Util.GetLocalHost().ToString();
776 m_log.InfoFormat( 776 m_log.InfoFormat(
777 "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}", 777 "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}",
778 m_externalHostName, name); 778 m_externalHostName, name);
779 } 779 }
780 else 780 else
@@ -909,16 +909,16 @@ namespace OpenSim.Framework
909 909
910 configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 910 configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
911 "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true); 911 "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true);
912 912
913 configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 913 configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
914 "Maximum size for physical prims", m_physPrimMax.ToString(), true); 914 "Maximum size for physical prims", m_physPrimMax.ToString(), true);
915 915
916 configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 916 configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
917 "Clamp prims to max size", m_clampPrimSize.ToString(), true); 917 "Clamp prims to max size", m_clampPrimSize.ToString(), true);
918 918
919 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 919 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
920 "Max objects this sim will hold", m_objectCapacity.ToString(), true); 920 "Max objects this sim will hold", m_objectCapacity.ToString(), true);
921 921
922 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 922 configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
923 "Scope ID for this region", ScopeID.ToString(), true); 923 "Scope ID for this region", ScopeID.ToString(), true);
924 924
@@ -956,16 +956,16 @@ namespace OpenSim.Framework
956 956
957 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 957 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
958 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); 958 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
959 959
960 configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 960 configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
961 "Maximum size for nonphysical prims", "0", true); 961 "Maximum size for nonphysical prims", "0", true);
962 962
963 configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 963 configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
964 "Maximum size for physical prims", "0", true); 964 "Maximum size for physical prims", "0", true);
965 965
966 configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 966 configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
967 "Clamp prims to max size", "false", true); 967 "Clamp prims to max size", "false", true);
968 968
969 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 969 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
970 "Max objects this sim will hold", "0", true); 970 "Max objects this sim will hold", "0", true);
971 971
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index 3143e3b..7a9b33d 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -157,9 +157,9 @@ namespace OpenSim.Framework.Serialization
157 public static string CreateOarObjectFilename(string objectName, UUID uuid, Vector3 pos) 157 public static string CreateOarObjectFilename(string objectName, UUID uuid, Vector3 pos)
158 { 158 {
159 return string.Format( 159 return string.Format(
160 OAR_OBJECT_FILENAME_TEMPLATE, objectName, 160 OAR_OBJECT_FILENAME_TEMPLATE, objectName,
161 Math.Round(pos.X), Math.Round(pos.Y), Math.Round(pos.Z), 161 Math.Round(pos.X), Math.Round(pos.Y), Math.Round(pos.Z),
162 uuid); 162 uuid);
163 } 163 }
164 164
165 /// <summary> 165 /// <summary>
@@ -171,9 +171,9 @@ namespace OpenSim.Framework.Serialization
171 /// <returns></returns> 171 /// <returns></returns>
172 public static string CreateOarObjectPath(string objectName, UUID uuid, Vector3 pos) 172 public static string CreateOarObjectPath(string objectName, UUID uuid, Vector3 pos)
173 { 173 {
174 return OBJECTS_PATH + CreateOarObjectFilename(objectName, uuid, pos); 174 return OBJECTS_PATH + CreateOarObjectFilename(objectName, uuid, pos);
175 } 175 }
176 176
177 /// <summary> 177 /// <summary>
178 /// Extract a plain path from an IAR path 178 /// Extract a plain path from an IAR path
179 /// </summary> 179 /// </summary>
@@ -184,18 +184,18 @@ namespace OpenSim.Framework.Serialization
184 List<string> plainDirs = new List<string>(); 184 List<string> plainDirs = new List<string>();
185 185
186 string[] iarDirs = iarPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); 186 string[] iarDirs = iarPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
187 187
188 foreach (string iarDir in iarDirs) 188 foreach (string iarDir in iarDirs)
189 { 189 {
190 if (!iarDir.Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR)) 190 if (!iarDir.Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR))
191 plainDirs.Add(iarDir); 191 plainDirs.Add(iarDir);
192 192
193 int i = iarDir.LastIndexOf(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR); 193 int i = iarDir.LastIndexOf(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
194 194
195 plainDirs.Add(iarDir.Remove(i)); 195 plainDirs.Add(iarDir.Remove(i));
196 } 196 }
197 197
198 return string.Join("/", plainDirs.ToArray()); 198 return string.Join("/", plainDirs.ToArray());
199 } 199 }
200 } 200 }
201} \ No newline at end of file 201}
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index d20f8c9..452df38 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Servers.HttpServer
51 { 51 {
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53 private HttpServerLogWriter httpserverlog = new HttpServerLogWriter(); 53 private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
54 54
55 private volatile int NotSocketErrors = 0; 55 private volatile int NotSocketErrors = 0;
56 public volatile bool HTTPDRunning = false; 56 public volatile bool HTTPDRunning = false;
57 57
@@ -160,7 +160,7 @@ namespace OpenSim.Framework.Servers.HttpServer
160 m_rpcHandlers[method] = handler; 160 m_rpcHandlers[method] = handler;
161 m_rpcHandlersKeepAlive[method] = keepAlive; // default 161 m_rpcHandlersKeepAlive[method] = keepAlive; // default
162 } 162 }
163 163
164 return true; 164 return true;
165 } 165 }
166 166
@@ -182,7 +182,7 @@ namespace OpenSim.Framework.Servers.HttpServer
182 public bool AddHTTPHandler(string methodName, GenericHTTPMethod handler) 182 public bool AddHTTPHandler(string methodName, GenericHTTPMethod handler)
183 { 183 {
184 //m_log.DebugFormat("[BASE HTTP SERVER]: Registering {0}", methodName); 184 //m_log.DebugFormat("[BASE HTTP SERVER]: Registering {0}", methodName);
185 185
186 lock (m_HTTPHandlers) 186 lock (m_HTTPHandlers)
187 { 187 {
188 if (!m_HTTPHandlers.ContainsKey(methodName)) 188 if (!m_HTTPHandlers.ContainsKey(methodName))
@@ -204,14 +204,14 @@ namespace OpenSim.Framework.Servers.HttpServer
204 if (!m_pollHandlers.ContainsKey(methodName)) 204 if (!m_pollHandlers.ContainsKey(methodName))
205 { 205 {
206 m_pollHandlers.Add(methodName,args); 206 m_pollHandlers.Add(methodName,args);
207 pollHandlerResult = true; 207 pollHandlerResult = true;
208 } 208 }
209 } 209 }
210 210
211 if (pollHandlerResult) 211 if (pollHandlerResult)
212 return AddHTTPHandler(methodName, handler); 212 return AddHTTPHandler(methodName, handler);
213 213
214 return false; 214 return false;
215 } 215 }
216 216
217 // Note that the agent string is provided simply to differentiate 217 // Note that the agent string is provided simply to differentiate
@@ -257,51 +257,51 @@ namespace OpenSim.Framework.Servers.HttpServer
257 { 257 {
258 IHttpClientContext context = (IHttpClientContext)source; 258 IHttpClientContext context = (IHttpClientContext)source;
259 IHttpRequest request = args.Request; 259 IHttpRequest request = args.Request;
260 260
261 PollServiceEventArgs psEvArgs; 261 PollServiceEventArgs psEvArgs;
262 262
263 if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs)) 263 if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs))
264 { 264 {
265 PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request); 265 PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request);
266 266
267 if (psEvArgs.Request != null) 267 if (psEvArgs.Request != null)
268 { 268 {
269 OSHttpRequest req = new OSHttpRequest(context, request); 269 OSHttpRequest req = new OSHttpRequest(context, request);
270 270
271 Stream requestStream = req.InputStream; 271 Stream requestStream = req.InputStream;
272 272
273 Encoding encoding = Encoding.UTF8; 273 Encoding encoding = Encoding.UTF8;
274 StreamReader reader = new StreamReader(requestStream, encoding); 274 StreamReader reader = new StreamReader(requestStream, encoding);
275 275
276 string requestBody = reader.ReadToEnd(); 276 string requestBody = reader.ReadToEnd();
277 277
278 Hashtable keysvals = new Hashtable(); 278 Hashtable keysvals = new Hashtable();
279 Hashtable headervals = new Hashtable(); 279 Hashtable headervals = new Hashtable();
280 280
281 string[] querystringkeys = req.QueryString.AllKeys; 281 string[] querystringkeys = req.QueryString.AllKeys;
282 string[] rHeaders = req.Headers.AllKeys; 282 string[] rHeaders = req.Headers.AllKeys;
283 283
284 keysvals.Add("body", requestBody); 284 keysvals.Add("body", requestBody);
285 keysvals.Add("uri", req.RawUrl); 285 keysvals.Add("uri", req.RawUrl);
286 keysvals.Add("content-type", req.ContentType); 286 keysvals.Add("content-type", req.ContentType);
287 keysvals.Add("http-method", req.HttpMethod); 287 keysvals.Add("http-method", req.HttpMethod);
288 288
289 foreach (string queryname in querystringkeys) 289 foreach (string queryname in querystringkeys)
290 { 290 {
291 keysvals.Add(queryname, req.QueryString[queryname]); 291 keysvals.Add(queryname, req.QueryString[queryname]);
292 } 292 }
293 293
294 foreach (string headername in rHeaders) 294 foreach (string headername in rHeaders)
295 { 295 {
296 headervals[headername] = req.Headers[headername]; 296 headervals[headername] = req.Headers[headername];
297 } 297 }
298 298
299 keysvals.Add("headers", headervals); 299 keysvals.Add("headers", headervals);
300 keysvals.Add("querystringkeys", querystringkeys); 300 keysvals.Add("querystringkeys", querystringkeys);
301 301
302 psEvArgs.Request(psreq.RequestID, keysvals); 302 psEvArgs.Request(psreq.RequestID, keysvals);
303 } 303 }
304 304
305 m_PollServiceManager.Enqueue(psreq); 305 m_PollServiceManager.Enqueue(psreq);
306 } 306 }
307 else 307 else
@@ -348,10 +348,10 @@ namespace OpenSim.Framework.Servers.HttpServer
348 { 348 {
349 try 349 try
350 { 350 {
351// m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); 351// m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl);
352 352
353 Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); 353 Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true);
354 354
355 // This is the REST agent interface. We require an agent to properly identify 355 // This is the REST agent interface. We require an agent to properly identify
356 // itself. If the REST handler recognizes the prefix it will attempt to 356 // itself. If the REST handler recognizes the prefix it will attempt to
357 // satisfy the request. If it is not recognizable, and no damage has occurred 357 // satisfy the request. If it is not recognizable, and no damage has occurred
@@ -456,7 +456,7 @@ namespace OpenSim.Framework.Servers.HttpServer
456 } 456 }
457 457
458 request.InputStream.Close(); 458 request.InputStream.Close();
459 459
460 // HTTP IN support. The script engine taes it from here 460 // HTTP IN support. The script engine taes it from here
461 // Nothing to worry about for us. 461 // Nothing to worry about for us.
462 // 462 //
@@ -540,7 +540,7 @@ namespace OpenSim.Framework.Servers.HttpServer
540 HandleLLSDRequests(request, response); 540 HandleLLSDRequests(request, response);
541 return; 541 return;
542 } 542 }
543 543
544// m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl); 544// m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
545 if (DoWeHaveAHTTPHandler(request.RawUrl)) 545 if (DoWeHaveAHTTPHandler(request.RawUrl))
546 { 546 {
@@ -594,7 +594,7 @@ namespace OpenSim.Framework.Servers.HttpServer
594 } 594 }
595 } 595 }
596 } 596 }
597 597
598 if (String.IsNullOrEmpty(bestMatch)) 598 if (String.IsNullOrEmpty(bestMatch))
599 { 599 {
600 streamHandler = null; 600 streamHandler = null;
@@ -641,7 +641,7 @@ namespace OpenSim.Framework.Servers.HttpServer
641 private bool TryGetHTTPHandler(string handlerKey, out GenericHTTPMethod HTTPHandler) 641 private bool TryGetHTTPHandler(string handlerKey, out GenericHTTPMethod HTTPHandler)
642 { 642 {
643// m_log.DebugFormat("[BASE HTTP HANDLER]: Looking for HTTP handler for {0}", handlerKey); 643// m_log.DebugFormat("[BASE HTTP HANDLER]: Looking for HTTP handler for {0}", handlerKey);
644 644
645 string bestMatch = null; 645 string bestMatch = null;
646 646
647 lock (m_HTTPHandlers) 647 lock (m_HTTPHandlers)
@@ -727,14 +727,14 @@ namespace OpenSim.Framework.Servers.HttpServer
727 { 727 {
728 xmlRprcRequest.Params.Add(request.RemoteIPEndPoint); // Param[1] 728 xmlRprcRequest.Params.Add(request.RemoteIPEndPoint); // Param[1]
729 XmlRpcResponse xmlRpcResponse; 729 XmlRpcResponse xmlRpcResponse;
730 730
731 XmlRpcMethod method; 731 XmlRpcMethod method;
732 bool methodWasFound; 732 bool methodWasFound;
733 lock (m_rpcHandlers) 733 lock (m_rpcHandlers)
734 { 734 {
735 methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method); 735 methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method);
736 } 736 }
737 737
738 if (methodWasFound) 738 if (methodWasFound)
739 { 739 {
740 xmlRprcRequest.Params.Add(request.Url); // Param[2] 740 xmlRprcRequest.Params.Add(request.Url); // Param[2]
@@ -766,10 +766,10 @@ namespace OpenSim.Framework.Servers.HttpServer
766 else 766 else
767 { 767 {
768 xmlRpcResponse = new XmlRpcResponse(); 768 xmlRpcResponse = new XmlRpcResponse();
769 769
770 // Code set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php 770 // Code set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
771 xmlRpcResponse.SetFault( 771 xmlRpcResponse.SetFault(
772 XmlRpcErrorCodes.SERVER_ERROR_METHOD, 772 XmlRpcErrorCodes.SERVER_ERROR_METHOD,
773 String.Format("Requested method [{0}] not found", methodName)); 773 String.Format("Requested method [{0}] not found", methodName));
774 } 774 }
775 775
@@ -786,11 +786,11 @@ namespace OpenSim.Framework.Servers.HttpServer
786 response.KeepAlive = false; 786 response.KeepAlive = false;
787 787
788 m_log.ErrorFormat("[BASE HTTP SERVER]: Handler not found for http request {0}", request.RawUrl); 788 m_log.ErrorFormat("[BASE HTTP SERVER]: Handler not found for http request {0}", request.RawUrl);
789 789
790 response.SendChunked = false; 790 response.SendChunked = false;
791 response.ContentLength64 = buf.Length; 791 response.ContentLength64 = buf.Length;
792 response.ContentEncoding = Encoding.UTF8; 792 response.ContentEncoding = Encoding.UTF8;
793 793
794 try 794 try
795 { 795 {
796 response.OutputStream.Write(buf, 0, buf.Length); 796 response.OutputStream.Write(buf, 0, buf.Length);
@@ -872,13 +872,13 @@ namespace OpenSim.Framework.Servers.HttpServer
872 872
873 OSD llsdRequest = null; 873 OSD llsdRequest = null;
874 OSD llsdResponse = null; 874 OSD llsdResponse = null;
875 875
876 bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest")); 876 bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest"));
877 877
878 if (requestBody.Length == 0) 878 if (requestBody.Length == 0)
879 // Get Request 879 // Get Request
880 { 880 {
881 requestBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd><map><key>request</key><string>get</string></map></llsd>"; 881 requestBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd><map><key>request</key><string>get</string></map></llsd>";
882 } 882 }
883 try 883 try
884 { 884 {
@@ -1090,7 +1090,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1090 string bestMatch = null; 1090 string bestMatch = null;
1091 1091
1092 //m_log.DebugFormat("[BASE HTTP HANDLER]: Checking if we have an HTTP handler for {0}", searchquery); 1092 //m_log.DebugFormat("[BASE HTTP HANDLER]: Checking if we have an HTTP handler for {0}", searchquery);
1093 1093
1094 lock (m_HTTPHandlers) 1094 lock (m_HTTPHandlers)
1095 { 1095 {
1096 foreach (string pattern in m_HTTPHandlers.Keys) 1096 foreach (string pattern in m_HTTPHandlers.Keys)
@@ -1156,7 +1156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1156 // You have to specifically register for '/' and to get it, you must specificaly request it 1156 // You have to specifically register for '/' and to get it, you must specificaly request it
1157 // 1157 //
1158 if (pattern == "/" && searchquery == "/" || pattern != "/") 1158 if (pattern == "/" && searchquery == "/" || pattern != "/")
1159 bestMatch = pattern; 1159 bestMatch = pattern;
1160 } 1160 }
1161 } 1161 }
1162 } 1162 }
@@ -1236,11 +1236,11 @@ namespace OpenSim.Framework.Servers.HttpServer
1236 } 1236 }
1237 1237
1238 public void HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response) 1238 public void HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
1239 { 1239 {
1240// m_log.DebugFormat( 1240// m_log.DebugFormat(
1241// "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}", 1241// "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}",
1242// request.RawUrl, request.HttpMethod); 1242// request.RawUrl, request.HttpMethod);
1243 1243
1244 switch (request.HttpMethod) 1244 switch (request.HttpMethod)
1245 { 1245 {
1246 case "OPTIONS": 1246 case "OPTIONS":
@@ -1256,7 +1256,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1256 private void HandleContentVerbs(OSHttpRequest request, OSHttpResponse response) 1256 private void HandleContentVerbs(OSHttpRequest request, OSHttpResponse response)
1257 { 1257 {
1258// m_log.DebugFormat("[BASE HTTP SERVER]: HandleContentVerbs for request to {0}", request.RawUrl); 1258// m_log.DebugFormat("[BASE HTTP SERVER]: HandleContentVerbs for request to {0}", request.RawUrl);
1259 1259
1260 // This is a test. There's a workable alternative.. as this way sucks. 1260 // This is a test. There's a workable alternative.. as this way sucks.
1261 // We'd like to put this into a text file parhaps that's easily editable. 1261 // We'd like to put this into a text file parhaps that's easily editable.
1262 // 1262 //
@@ -1391,7 +1391,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1391 1391
1392// m_log.DebugFormat( 1392// m_log.DebugFormat(
1393// "[BASE HTTP HANDLER]: TryGetHTTPHandlerPathBased() looking for HTTP handler to match {0}", searchquery); 1393// "[BASE HTTP HANDLER]: TryGetHTTPHandlerPathBased() looking for HTTP handler to match {0}", searchquery);
1394 1394
1395 lock (m_HTTPHandlers) 1395 lock (m_HTTPHandlers)
1396 { 1396 {
1397 foreach (string pattern in m_HTTPHandlers.Keys) 1397 foreach (string pattern in m_HTTPHandlers.Keys)
@@ -1452,7 +1452,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1452 1452
1453 //Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this 1453 //Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this
1454 //and should check for NullReferenceExceptions 1454 //and should check for NullReferenceExceptions
1455 1455
1456 if (string.IsNullOrEmpty(contentType)) 1456 if (string.IsNullOrEmpty(contentType))
1457 { 1457 {
1458 contentType = "text/html"; 1458 contentType = "text/html";
@@ -1472,8 +1472,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1472 1472
1473 byte[] buffer; 1473 byte[] buffer;
1474 1474
1475 if (!(contentType.Contains("image") 1475 if (!(contentType.Contains("image")
1476 || contentType.Contains("x-shockwave-flash") 1476 || contentType.Contains("x-shockwave-flash")
1477 || contentType.Contains("application/x-oar"))) 1477 || contentType.Contains("application/x-oar")))
1478 { 1478 {
1479 // Text 1479 // Text
@@ -1504,7 +1504,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1504 { 1504 {
1505 response.OutputStream.Flush(); 1505 response.OutputStream.Flush();
1506 response.Send(); 1506 response.Send();
1507 1507
1508 //if (!response.KeepAlive && response.ReuseContext) 1508 //if (!response.KeepAlive && response.ReuseContext)
1509 // response.FreeContext(); 1509 // response.FreeContext();
1510 } 1510 }
@@ -1611,11 +1611,11 @@ namespace OpenSim.Framework.Servers.HttpServer
1611 m_httpListener2 = CoolHTTPListener.Create(m_listenIPAddress, (int)m_port); 1611 m_httpListener2 = CoolHTTPListener.Create(m_listenIPAddress, (int)m_port);
1612 m_httpListener2.ExceptionThrown += httpServerException; 1612 m_httpListener2.ExceptionThrown += httpServerException;
1613 m_httpListener2.LogWriter = httpserverlog; 1613 m_httpListener2.LogWriter = httpserverlog;
1614 1614
1615 // Uncomment this line in addition to those in HttpServerLogWriter 1615 // Uncomment this line in addition to those in HttpServerLogWriter
1616 // if you want more detailed trace information from the HttpServer 1616 // if you want more detailed trace information from the HttpServer
1617 //m_httpListener2.UseTraceLogs = true; 1617 //m_httpListener2.UseTraceLogs = true;
1618 1618
1619 //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor; 1619 //m_httpListener2.DisconnectHandler = httpServerDisconnectMonitor;
1620 } 1620 }
1621 else 1621 else
@@ -1643,8 +1643,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1643 { 1643 {
1644 m_log.Error("[BASE HTTP SERVER]: Error - " + e.Message); 1644 m_log.Error("[BASE HTTP SERVER]: Error - " + e.Message);
1645 m_log.Error("[BASE HTTP SERVER]: Tip: Do you have permission to listen on port " + m_port + ", " + m_sslport + "?"); 1645 m_log.Error("[BASE HTTP SERVER]: Tip: Do you have permission to listen on port " + m_port + ", " + m_sslport + "?");
1646 1646
1647 // We want this exception to halt the entire server since in current configurations we aren't too 1647 // We want this exception to halt the entire server since in current configurations we aren't too
1648 // useful without inbound HTTP. 1648 // useful without inbound HTTP.
1649 throw e; 1649 throw e;
1650 } 1650 }
@@ -1656,7 +1656,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1656 { 1656 {
1657 case SocketError.NotSocket: 1657 case SocketError.NotSocket:
1658 NotSocketErrors++; 1658 NotSocketErrors++;
1659 1659
1660 break; 1660 break;
1661 } 1661 }
1662 } 1662 }
@@ -1686,12 +1686,11 @@ namespace OpenSim.Framework.Servers.HttpServer
1686 m_httpListener2.LogWriter = null; 1686 m_httpListener2.LogWriter = null;
1687 m_httpListener2.RequestReceived -= OnRequest; 1687 m_httpListener2.RequestReceived -= OnRequest;
1688 m_httpListener2.Stop(); 1688 m_httpListener2.Stop();
1689 } 1689 }
1690 catch (NullReferenceException) 1690 catch (NullReferenceException)
1691 { 1691 {
1692 m_log.Warn("[BASE HTTP SERVER]: Null Reference when stopping HttpServer."); 1692 m_log.Warn("[BASE HTTP SERVER]: Null Reference when stopping HttpServer.");
1693 } 1693 }
1694
1695 } 1694 }
1696 1695
1697 public void RemoveStreamHandler(string httpMethod, string path) 1696 public void RemoveStreamHandler(string httpMethod, string path)
@@ -1712,7 +1711,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1712 m_HTTPHandlers.Remove(path); 1711 m_HTTPHandlers.Remove(path);
1713 return; 1712 return;
1714 } 1713 }
1715 1714
1716 m_HTTPHandlers.Remove(GetHandlerKey(httpMethod, path)); 1715 m_HTTPHandlers.Remove(GetHandlerKey(httpMethod, path));
1717 } 1716 }
1718 } 1717 }
@@ -1728,7 +1727,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1728 } 1727 }
1729 1728
1730 RemoveHTTPHandler(httpMethod, path); 1729 RemoveHTTPHandler(httpMethod, path);
1731
1732 } 1730 }
1733 1731
1734 public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler) 1732 public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler)
@@ -1759,7 +1757,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1759 } 1757 }
1760 } 1758 }
1761 1759
1762
1763 public bool RemoveLLSDHandler(string path, LLSDMethod handler) 1760 public bool RemoveLLSDHandler(string path, LLSDMethod handler)
1764 { 1761 {
1765 try 1762 try
@@ -1833,7 +1830,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1833 oresp = osresp; 1830 oresp = osresp;
1834 } 1831 }
1835 } 1832 }
1836 1833
1837 /// <summary> 1834 /// <summary>
1838 /// Relays HttpServer log messages to our own logging mechanism. 1835 /// Relays HttpServer log messages to our own logging mechanism.
1839 /// </summary> 1836 /// </summary>
@@ -1852,7 +1849,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1852 { 1849 {
1853 case LogPrio.Trace: 1850 case LogPrio.Trace:
1854 m_log.DebugFormat("[{0}]: {1}", source, message); 1851 m_log.DebugFormat("[{0}]: {1}", source, message);
1855 break; 1852 break;
1856 case LogPrio.Debug: 1853 case LogPrio.Debug:
1857 m_log.DebugFormat("[{0}]: {1}", source, message); 1854 m_log.DebugFormat("[{0}]: {1}", source, message);
1858 break; 1855 break;
@@ -1872,8 +1869,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1872 break; 1869 break;
1873 } 1870 }
1874 */ 1871 */
1875 1872
1876 return; 1873 return;
1877 } 1874 }
1878 } 1875 }
1879} \ No newline at end of file 1876}