diff options
author | Jeff Ames | 2009-06-10 04:28:56 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-10 04:28:56 +0000 |
commit | a23d64dec1cbf88abc3c7e84664a683dee534e4a (patch) | |
tree | 7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Region | |
parent | Letting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff) | |
download | opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2 opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
39 files changed, 81 insertions, 80 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index a1d4b31..1ff53c9 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -391,7 +391,7 @@ namespace OpenSim | |||
391 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | 391 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); |
392 | 392 | ||
393 | // TODO : Try setting resource for region xstats here on scene | 393 | // TODO : Try setting resource for region xstats here on scene |
394 | scene.CommsManager.HttpServer.AddStreamHandler( new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); | 394 | scene.CommsManager.HttpServer.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); |
395 | 395 | ||
396 | try | 396 | try |
397 | { | 397 | { |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ac5b27e..7d4bb8e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -9453,7 +9453,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9453 | } | 9453 | } |
9454 | 9454 | ||
9455 | // in the end, we dereference this, so we have to check if it's null | 9455 | // in the end, we dereference this, so we have to check if it's null |
9456 | if (m_imageManager != null ) | 9456 | if (m_imageManager != null) |
9457 | m_imageManager.ProcessImageQueue(10); | 9457 | m_imageManager.ProcessImageQueue(10); |
9458 | PacketPool.Instance.ReturnPacket(Pack); | 9458 | PacketPool.Instance.ReturnPacket(Pack); |
9459 | } | 9459 | } |
@@ -10164,7 +10164,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10164 | mirplk.AgentData.AgentID = AgentId; | 10164 | mirplk.AgentData.AgentID = AgentId; |
10165 | mirplk.RequestData.ItemType = mapitemtype; | 10165 | mirplk.RequestData.ItemType = mapitemtype; |
10166 | mirplk.Data = new MapItemReplyPacket.DataBlock[replies.Length]; | 10166 | mirplk.Data = new MapItemReplyPacket.DataBlock[replies.Length]; |
10167 | for (int i = 0; i < replies.Length; i++ ) | 10167 | for (int i = 0; i < replies.Length; i++) |
10168 | { | 10168 | { |
10169 | MapItemReplyPacket.DataBlock mrdata = new MapItemReplyPacket.DataBlock(); | 10169 | MapItemReplyPacket.DataBlock mrdata = new MapItemReplyPacket.DataBlock(); |
10170 | mrdata.X = replies[i].x; | 10170 | mrdata.X = replies[i].x; |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index f30b9f7..58711e5 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | |||
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
133 | { | 133 | { |
134 | // Region doesn't exist here. Trying to link remote region | 134 | // Region doesn't exist here. Trying to link remote region |
135 | 135 | ||
136 | m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort ); | 136 | m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort); |
137 | regionInfo.RegionID = LinkRegion(regionInfo); // UUID.Random(); | 137 | regionInfo.RegionID = LinkRegion(regionInfo); // UUID.Random(); |
138 | if (!regionInfo.RegionID.Equals(UUID.Zero)) | 138 | if (!regionInfo.RegionID.Equals(UUID.Zero)) |
139 | { | 139 | { |
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index bb4ee33..3712fb9 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local | |||
88 | } | 88 | } |
89 | else | 89 | else |
90 | { | 90 | { |
91 | m_log.WarnFormat( "[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID); | 91 | m_log.WarnFormat("[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID); |
92 | } | 92 | } |
93 | 93 | ||
94 | callback(folders, items); | 94 | callback(folders, items); |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 7990c9b..f82a6a1 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -435,7 +435,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
435 | // string externalUri = (string) responseData["sim_uri"]; | 435 | // string externalUri = (string) responseData["sim_uri"]; |
436 | 436 | ||
437 | //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); | 437 | //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); |
438 | regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI ); | 438 | regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI); |
439 | 439 | ||
440 | if (m_useRemoteRegionCache) | 440 | if (m_useRemoteRegionCache) |
441 | { | 441 | { |
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index d09f5ef..35713ad 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -231,7 +231,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
231 | 231 | ||
232 | private void UpdateMemoryCache(string key, AssetBase asset) | 232 | private void UpdateMemoryCache(string key, AssetBase asset) |
233 | { | 233 | { |
234 | if( m_MemoryCacheEnabled ) | 234 | if (m_MemoryCacheEnabled) |
235 | { | 235 | { |
236 | if (m_MemoryExpiration > TimeSpan.Zero) | 236 | if (m_MemoryExpiration > TimeSpan.Zero) |
237 | { | 237 | { |
@@ -405,7 +405,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
405 | File.Delete(filename); | 405 | File.Delete(filename); |
406 | } | 406 | } |
407 | 407 | ||
408 | if( m_MemoryCacheEnabled ) | 408 | if (m_MemoryCacheEnabled) |
409 | m_MemoryCache.Remove(id); | 409 | m_MemoryCache.Remove(id); |
410 | } | 410 | } |
411 | catch (Exception e) | 411 | catch (Exception e) |
@@ -424,7 +424,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
424 | Directory.Delete(dir); | 424 | Directory.Delete(dir); |
425 | } | 425 | } |
426 | 426 | ||
427 | if( m_MemoryCacheEnabled ) | 427 | if (m_MemoryCacheEnabled) |
428 | m_MemoryCache.Clear(); | 428 | m_MemoryCache.Clear(); |
429 | } | 429 | } |
430 | 430 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 8cc2655..66f1e14 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
116 | { | 116 | { |
117 | byte dialog = im.dialog; | 117 | byte dialog = im.dialog; |
118 | 118 | ||
119 | if ( dialog != (byte)InstantMessageDialog.MessageFromAgent | 119 | if (dialog != (byte)InstantMessageDialog.MessageFromAgent |
120 | && dialog != (byte)InstantMessageDialog.StartTyping | 120 | && dialog != (byte)InstantMessageDialog.StartTyping |
121 | && dialog != (byte)InstantMessageDialog.StopTyping | 121 | && dialog != (byte)InstantMessageDialog.StopTyping |
122 | && dialog != (byte)InstantMessageDialog.MessageFromObject) | 122 | && dialog != (byte)InstantMessageDialog.MessageFromObject) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 986f604..12f5d19 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
219 | else | 219 | else |
220 | { | 220 | { |
221 | if (m_TransferModule != null) | 221 | if (m_TransferModule != null) |
222 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); | 222 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); |
223 | } | 223 | } |
224 | } | 224 | } |
225 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) | 225 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) |
@@ -233,7 +233,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
233 | else | 233 | else |
234 | { | 234 | { |
235 | if (m_TransferModule != null) | 235 | if (m_TransferModule != null) |
236 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); | 236 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); |
237 | } | 237 | } |
238 | } | 238 | } |
239 | else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) | 239 | else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) |
@@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
300 | else | 300 | else |
301 | { | 301 | { |
302 | if (m_TransferModule != null) | 302 | if (m_TransferModule != null) |
303 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); | 303 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); |
304 | } | 304 | } |
305 | } | 305 | } |
306 | } | 306 | } |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index da43ce8..b8cc308 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -890,8 +890,8 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
890 | 890 | ||
891 | responseMap["sim_host"] = OSD.FromString(rezRespSim_host); | 891 | responseMap["sim_host"] = OSD.FromString(rezRespSim_host); |
892 | responseMap["sim_port"] = OSD.FromInteger(rrPort); | 892 | responseMap["sim_port"] = OSD.FromInteger(rrPort); |
893 | responseMap["region_x"] = OSD.FromInteger(rrX ); | 893 | responseMap["region_x"] = OSD.FromInteger(rrX); |
894 | responseMap["region_y"] = OSD.FromInteger(rrY ); | 894 | responseMap["region_y"] = OSD.FromInteger(rrY); |
895 | responseMap["region_id"] = OSD.FromUUID(rrRID); | 895 | responseMap["region_id"] = OSD.FromUUID(rrRID); |
896 | responseMap["sim_access"] = OSD.FromString(rrAccess); | 896 | responseMap["sim_access"] = OSD.FromString(rrAccess); |
897 | 897 | ||
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs index 99a294d..7afada3 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | |||
@@ -511,7 +511,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
511 | if (z_sort.ContainsKey(sortedlocalIds[s])) | 511 | if (z_sort.ContainsKey(sortedlocalIds[s])) |
512 | { | 512 | { |
513 | DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]]; | 513 | DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]]; |
514 | for (int r = 0; r < rectDrawStruct.trns.Length; r++ ) | 514 | for (int r = 0; r < rectDrawStruct.trns.Length; r++) |
515 | { | 515 | { |
516 | g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts); | 516 | g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts); |
517 | } | 517 | } |
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index d26385d..7c02f9a 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
63 | 63 | ||
64 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 64 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
65 | 65 | ||
66 | public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info ) | 66 | public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info) |
67 | { | 67 | { |
68 | regionInfo = region_info; | 68 | regionInfo = region_info; |
69 | osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); | 69 | osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); |
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
95 | private string Report() | 95 | private string Report() |
96 | { | 96 | { |
97 | OSDMap args = new OSDMap(30); | 97 | OSDMap args = new OSDMap(30); |
98 | //int time = Util.ToUnixTime( DateTime.Now ); | 98 | //int time = Util.ToUnixTime(DateTime.Now); |
99 | args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); | 99 | args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); |
100 | args["TimeZoneName"] = OSD.FromString(localZone); | 100 | args["TimeZoneName"] = OSD.FromString(localZone); |
101 | args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours); | 101 | args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 72ed646..0019b23 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
645 | public IJ2KDecoder j2kdecode; | 645 | public IJ2KDecoder j2kdecode; |
646 | private System.Threading.Thread thisthread; | 646 | private System.Threading.Thread thisthread; |
647 | 647 | ||
648 | public void run( object o) | 648 | public void run(object o) |
649 | { | 649 | { |
650 | for (int i=0;i<arrassets.Length;i++) | 650 | for (int i=0;i<arrassets.Length;i++) |
651 | { | 651 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 4171d17..a9a150a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -3325,7 +3325,7 @@ if (m_shape != null) { | |||
3325 | bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0); | 3325 | bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0); |
3326 | bool wasVD = VolumeDetectActive; | 3326 | bool wasVD = VolumeDetectActive; |
3327 | 3327 | ||
3328 | if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD) ) | 3328 | if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD)) |
3329 | { | 3329 | { |
3330 | return; | 3330 | return; |
3331 | } | 3331 | } |
@@ -3477,7 +3477,7 @@ if (m_shape != null) { | |||
3477 | } | 3477 | } |
3478 | else | 3478 | else |
3479 | { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like | 3479 | { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like |
3480 | // (mumbles, well, at least if you have infinte CPU powers :-) ) | 3480 | // (mumbles, well, at least if you have infinte CPU powers :-)) |
3481 | if (this.PhysActor != null) | 3481 | if (this.PhysActor != null) |
3482 | { | 3482 | { |
3483 | PhysActor.SetVolumeDetect(0); | 3483 | PhysActor.SetVolumeDetect(0); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c3af40f..f4776e3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2032,7 +2032,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2032 | UUID[] animIDs; | 2032 | UUID[] animIDs; |
2033 | int[] sequenceNums; | 2033 | int[] sequenceNums; |
2034 | UUID[] objectIDs; | 2034 | UUID[] objectIDs; |
2035 | m_animations.GetArrays( out animIDs, out sequenceNums, out objectIDs); | 2035 | m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); |
2036 | return animIDs; | 2036 | return animIDs; |
2037 | } | 2037 | } |
2038 | 2038 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index dae095f..bb8f27d 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs | |||
@@ -68,13 +68,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
68 | entman.Add(sog); | 68 | entman.Add(sog); |
69 | 69 | ||
70 | found = (SceneObjectGroup)entman[obj1]; | 70 | found = (SceneObjectGroup)entman[obj1]; |
71 | Assert.That(found.UUID ,Is.EqualTo(obj1) ); | 71 | Assert.That(found.UUID ,Is.EqualTo(obj1)); |
72 | found = (SceneObjectGroup)entman[li1]; | 72 | found = (SceneObjectGroup)entman[li1]; |
73 | Assert.That(found.UUID ,Is.EqualTo(obj1) ); | 73 | Assert.That(found.UUID ,Is.EqualTo(obj1)); |
74 | found = (SceneObjectGroup)entman[obj2]; | 74 | found = (SceneObjectGroup)entman[obj2]; |
75 | Assert.That(found.UUID ,Is.EqualTo(obj2) ); | 75 | Assert.That(found.UUID ,Is.EqualTo(obj2)); |
76 | found = (SceneObjectGroup)entman[li2]; | 76 | found = (SceneObjectGroup)entman[li2]; |
77 | Assert.That(found.UUID ,Is.EqualTo(obj2) ); | 77 | Assert.That(found.UUID ,Is.EqualTo(obj2)); |
78 | 78 | ||
79 | entman.Remove(obj1); | 79 | entman.Remove(obj1); |
80 | entman.Remove(li2); | 80 | entman.Remove(li2); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs index 89eecf8..f03e5fc 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | |||
@@ -404,7 +404,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
404 | 404 | ||
405 | private bool IsAConnectionMatchFor(ChannelState cs) | 405 | private bool IsAConnectionMatchFor(ChannelState cs) |
406 | { | 406 | { |
407 | return ( | 407 | return ( |
408 | Server == cs.Server && | 408 | Server == cs.Server && |
409 | IrcChannel == cs.IrcChannel && | 409 | IrcChannel == cs.IrcChannel && |
410 | Port == cs.Port && | 410 | Port == cs.Port && |
@@ -419,7 +419,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
419 | 419 | ||
420 | private bool IsAPerfectMatchFor(ChannelState cs) | 420 | private bool IsAPerfectMatchFor(ChannelState cs) |
421 | { | 421 | { |
422 | return ( IsAConnectionMatchFor(cs) && | 422 | return (IsAConnectionMatchFor(cs) && |
423 | RelayChannelOut == cs.RelayChannelOut && | 423 | RelayChannelOut == cs.RelayChannelOut && |
424 | PrivateMessageFormat == cs.PrivateMessageFormat && | 424 | PrivateMessageFormat == cs.PrivateMessageFormat && |
425 | NoticeMessageFormat == cs.NoticeMessageFormat && | 425 | NoticeMessageFormat == cs.NoticeMessageFormat && |
@@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
598 | { | 598 | { |
599 | foreach (ChannelState cs in IRCBridgeModule.m_channels) | 599 | foreach (ChannelState cs in IRCBridgeModule.m_channels) |
600 | { | 600 | { |
601 | if ( p_irc == cs.irc) | 601 | if (p_irc == cs.irc) |
602 | { | 602 | { |
603 | 603 | ||
604 | // This non-IRC differentiator moved to here | 604 | // This non-IRC differentiator moved to here |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs index eee122b..caec43d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs | |||
@@ -147,7 +147,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
147 | response["content_type"] = "text/xml"; | 147 | response["content_type"] = "text/xml"; |
148 | response["keepalive"] = false; | 148 | response["keepalive"] = false; |
149 | response["int_response_code"] = 200; | 149 | response["int_response_code"] = 200; |
150 | response["str_response_string"] = String.Format( | 150 | response["str_response_string"] = String.Format( |
151 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 151 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
152 | "<document type=\"freeswitch/xml\">\r\n" + | 152 | "<document type=\"freeswitch/xml\">\r\n" + |
153 | "<section name=\"directory\" description=\"User Directory\">\r\n" + | 153 | "<section name=\"directory\" description=\"User Directory\">\r\n" + |
@@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
184 | response["content_type"] = "text/xml"; | 184 | response["content_type"] = "text/xml"; |
185 | response["keepalive"] = false; | 185 | response["keepalive"] = false; |
186 | response["int_response_code"] = 200; | 186 | response["int_response_code"] = 200; |
187 | response["str_response_string"] = String.Format( | 187 | response["str_response_string"] = String.Format( |
188 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 188 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
189 | "<document type=\"freeswitch/xml\">\r\n" + | 189 | "<document type=\"freeswitch/xml\">\r\n" + |
190 | "<section name=\"directory\" description=\"User Directory\">\r\n" + | 190 | "<section name=\"directory\" description=\"User Directory\">\r\n" + |
@@ -230,7 +230,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
230 | response["content_type"] = "text/xml"; | 230 | response["content_type"] = "text/xml"; |
231 | response["keepalive"] = false; | 231 | response["keepalive"] = false; |
232 | response["int_response_code"] = 200; | 232 | response["int_response_code"] = 200; |
233 | response["str_response_string"] = String.Format( | 233 | response["str_response_string"] = String.Format( |
234 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 234 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
235 | "<document type=\"freeswitch/xml\">\r\n" + | 235 | "<document type=\"freeswitch/xml\">\r\n" + |
236 | "<section name=\"directory\" description=\"User Directory\">\r\n" + | 236 | "<section name=\"directory\" description=\"User Directory\">\r\n" + |
@@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
263 | response["content_type"] = "text/xml"; | 263 | response["content_type"] = "text/xml"; |
264 | response["keepalive"] = false; | 264 | response["keepalive"] = false; |
265 | response["int_response_code"] = 200; | 265 | response["int_response_code"] = 200; |
266 | response["str_response_string"] = String.Format( | 266 | response["str_response_string"] = String.Format( |
267 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 267 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
268 | "<document type=\"freeswitch/xml\">\r\n" + | 268 | "<document type=\"freeswitch/xml\">\r\n" + |
269 | "<section name=\"directory\" description=\"User Directory\">\r\n" + | 269 | "<section name=\"directory\" description=\"User Directory\">\r\n" + |
@@ -317,7 +317,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
317 | // response["content_type"] = "text/xml"; | 317 | // response["content_type"] = "text/xml"; |
318 | // response["keepalive"] = false; | 318 | // response["keepalive"] = false; |
319 | // response["int_response_code"] = 200; | 319 | // response["int_response_code"] = 200; |
320 | // response["str_response_string"] = String.Format( | 320 | // response["str_response_string"] = String.Format( |
321 | // "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 321 | // "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
322 | // "<document type=\"freeswitch/xml\">\r\n" + | 322 | // "<document type=\"freeswitch/xml\">\r\n" + |
323 | // "<section name=\"directory\" description=\"User Directory\">\r\n" + | 323 | // "<section name=\"directory\" description=\"User Directory\">\r\n" + |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 84d7c4c..de78f5f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -556,7 +556,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
556 | response["content_type"] = "text/xml"; | 556 | response["content_type"] = "text/xml"; |
557 | response["keepalive"] = false; | 557 | response["keepalive"] = false; |
558 | 558 | ||
559 | response["str_response_string"] = String.Format( | 559 | response["str_response_string"] = String.Format( |
560 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 560 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
561 | "<VCConfiguration>\r\n"+ | 561 | "<VCConfiguration>\r\n"+ |
562 | "<DefaultRealm>{0}</DefaultRealm>\r\n" + | 562 | "<DefaultRealm>{0}</DefaultRealm>\r\n" + |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs index 5d8760f..bc421c2 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs | |||
@@ -1234,7 +1234,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1234 | // UDP version doesn't seem to behave nicely. But we're going to send it out here | 1234 | // UDP version doesn't seem to behave nicely. But we're going to send it out here |
1235 | // with an empty group membership to hopefully remove groups being displayed due | 1235 | // with an empty group membership to hopefully remove groups being displayed due |
1236 | // to the core Groups Stub | 1236 | // to the core Groups Stub |
1237 | remoteClient.SendGroupMembership( new GroupMembershipData[0] ); | 1237 | remoteClient.SendGroupMembership(new GroupMembershipData[0]); |
1238 | 1238 | ||
1239 | GroupMembershipData[] membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), dataForAgentID).ToArray(); | 1239 | GroupMembershipData[] membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), dataForAgentID).ToArray(); |
1240 | 1240 | ||
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs index 582dc0f..52c4e03 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs | |||
@@ -115,7 +115,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
115 | { | 115 | { |
116 | m_log.Debug("[CONTENT MANAG] saving " + scene.RegionInfo.RegionName + " with log message: " + logMessage + " length of message: " + logMessage.Length); | 116 | m_log.Debug("[CONTENT MANAG] saving " + scene.RegionInfo.RegionName + " with log message: " + logMessage + " length of message: " + logMessage.Length); |
117 | m_database.SaveRegion(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, logMessage); | 117 | m_database.SaveRegion(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, logMessage); |
118 | m_log.Debug("[CONTENT MANAG] the region name we are dealing with heeeeeeeere: " + scene.RegionInfo.RegionName ); | 118 | m_log.Debug("[CONTENT MANAG] the region name we are dealing with heeeeeeeere: " + scene.RegionInfo.RegionName); |
119 | } | 119 | } |
120 | 120 | ||
121 | public void DeleteAllMetaObjects() | 121 | public void DeleteAllMetaObjects() |
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs index 9a91fbf..a3d7977 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs | |||
@@ -123,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
123 | { | 123 | { |
124 | String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + | 124 | String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + |
125 | Slash.DirectorySeparatorChar + "heightmap.r32"; | 125 | Slash.DirectorySeparatorChar + "heightmap.r32"; |
126 | FileStream fs = new FileStream( filename, FileMode.Open); | 126 | FileStream fs = new FileStream(filename, FileMode.Open); |
127 | StreamReader sr = new StreamReader(fs); | 127 | StreamReader sr = new StreamReader(fs); |
128 | String result = sr.ReadToEnd(); | 128 | String result = sr.ReadToEnd(); |
129 | sr.Close(); | 129 | sr.Close(); |
@@ -135,7 +135,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
135 | { | 135 | { |
136 | String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + | 136 | String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + |
137 | Slash.DirectorySeparatorChar + "heightmap.r32"; | 137 | Slash.DirectorySeparatorChar + "heightmap.r32"; |
138 | FileStream fs = new FileStream( filename, FileMode.Open); | 138 | FileStream fs = new FileStream(filename, FileMode.Open); |
139 | StreamReader sr = new StreamReader(fs); | 139 | StreamReader sr = new StreamReader(fs); |
140 | String result = sr.ReadToEnd(); | 140 | String result = sr.ReadToEnd(); |
141 | sr.Close(); | 141 | sr.Close(); |
@@ -232,7 +232,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
232 | try | 232 | try |
233 | { | 233 | { |
234 | logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; | 234 | logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; |
235 | fs = new FileStream( logLocation, FileMode.Open); | 235 | fs = new FileStream(logLocation, FileMode.Open); |
236 | sr = new StreamReader(fs); | 236 | sr = new StreamReader(fs); |
237 | logMessage = sr.ReadToEnd(); | 237 | logMessage = sr.ReadToEnd(); |
238 | sr.Close(); | 238 | sr.Close(); |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index c1c255b..a40a0d9 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -170,7 +170,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
170 | SceneObjectPart sop = GetSOP(); | 170 | SceneObjectPart sop = GetSOP(); |
171 | IObjectMaterial[] rets = new IObjectMaterial[getNumberOfSides(sop)]; | 171 | IObjectMaterial[] rets = new IObjectMaterial[getNumberOfSides(sop)]; |
172 | 172 | ||
173 | for (int i = 0; i < rets.Length;i++ ) | 173 | for (int i = 0; i < rets.Length; i++) |
174 | { | 174 | { |
175 | rets[i] = new SOPObjectMaterial(i, sop); | 175 | rets[i] = new SOPObjectMaterial(i, sop); |
176 | } | 176 | } |
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs index f006cf1..58c2a15 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | |||
@@ -459,7 +459,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
459 | { | 459 | { |
460 | lock (m_prims) | 460 | lock (m_prims) |
461 | { | 461 | { |
462 | foreach ( BulletDotNETPrim prim in m_prims) | 462 | foreach (BulletDotNETPrim prim in m_prims) |
463 | { | 463 | { |
464 | if (prim.Body != null) | 464 | if (prim.Body != null) |
465 | m_world.removeRigidBody(prim.Body); | 465 | m_world.removeRigidBody(prim.Body); |
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 253f451..06cfcdd 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -429,8 +429,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
429 | { | 429 | { |
430 | #if SPAM | 430 | #if SPAM |
431 | m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + | 431 | m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + |
432 | 432 | minSizeForComplexMesh.ToString() + " - creating simple bounding box"); | |
433 | minSizeForComplexMesh.ToString() + " - creating simple bounding box" ); | ||
434 | #endif | 433 | #endif |
435 | mesh = CreateBoundingBoxMesh(mesh); | 434 | mesh = CreateBoundingBoxMesh(mesh); |
436 | mesh.DumpRaw(baseDir, primName, "Z extruded"); | 435 | mesh.DumpRaw(baseDir, primName, "Z extruded"); |
@@ -443,6 +442,5 @@ minSizeForComplexMesh.ToString() + " - creating simple bounding box" ); | |||
443 | 442 | ||
444 | return mesh; | 443 | return mesh; |
445 | } | 444 | } |
446 | |||
447 | } | 445 | } |
448 | } | 446 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 6759fd9..3f0d6c1 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -1116,7 +1116,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1116 | m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - " | 1116 | m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - " |
1117 | + (Shell!=IntPtr.Zero ? "Shell ":"") | 1117 | + (Shell!=IntPtr.Zero ? "Shell ":"") |
1118 | + (Body!=IntPtr.Zero ? "Body ":"") | 1118 | + (Body!=IntPtr.Zero ? "Body ":"") |
1119 | + (Amotor!=IntPtr.Zero ? "Amotor ":"") ); | 1119 | + (Amotor!=IntPtr.Zero ? "Amotor ":"")); |
1120 | } | 1120 | } |
1121 | AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor); | 1121 | AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor); |
1122 | 1122 | ||
@@ -1182,7 +1182,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1182 | m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - " | 1182 | m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - " |
1183 | + (Shell==IntPtr.Zero ? "Shell ":"") | 1183 | + (Shell==IntPtr.Zero ? "Shell ":"") |
1184 | + (Body==IntPtr.Zero ? "Body ":"") | 1184 | + (Body==IntPtr.Zero ? "Body ":"") |
1185 | + (Amotor==IntPtr.Zero ? "Amotor ":"") ); | 1185 | + (Amotor==IntPtr.Zero ? "Amotor ":"")); |
1186 | } | 1186 | } |
1187 | } | 1187 | } |
1188 | 1188 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index e6f45c8..d8d3b68 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2593,7 +2593,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2593 | if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) | 2593 | if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) |
2594 | && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) | 2594 | && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) |
2595 | && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02) | 2595 | && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02) |
2596 | && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01 )) | 2596 | && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01)) |
2597 | { | 2597 | { |
2598 | _zeroFlag = true; | 2598 | _zeroFlag = true; |
2599 | m_throttleUpdates = false; | 2599 | m_throttleUpdates = false; |
@@ -2981,7 +2981,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2981 | Matrix4 transposeMatrix = new Matrix4(); | 2981 | Matrix4 transposeMatrix = new Matrix4(); |
2982 | for (int i = 0; i < 4; i++) | 2982 | for (int i = 0; i < 4; i++) |
2983 | for (int j = 0; j < 4; j++) | 2983 | for (int j = 0; j < 4; j++) |
2984 | Matrix4SetValue( ref transposeMatrix, i, j, pMat[j, i]); | 2984 | Matrix4SetValue(ref transposeMatrix, i, j, pMat[j, i]); |
2985 | return transposeMatrix; | 2985 | return transposeMatrix; |
2986 | } | 2986 | } |
2987 | 2987 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs b/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs index e6b84ae..063b14f 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs | |||
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
234 | SetDefaultsForType(pType); | 234 | SetDefaultsForType(pType); |
235 | Reset(); | 235 | Reset(); |
236 | } | 236 | } |
237 | else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE ) | 237 | else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE) |
238 | { | 238 | { |
239 | // Set properties | 239 | // Set properties |
240 | SetDefaultsForType(pType); | 240 | SetDefaultsForType(pType); |
@@ -408,7 +408,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
408 | // m_bankingMix = 0.8f; | 408 | // m_bankingMix = 0.8f; |
409 | // m_bankingTimescale = 1; | 409 | // m_bankingTimescale = 1; |
410 | // m_referenceFrame = Quaternion.Identity; | 410 | // m_referenceFrame = Quaternion.Identity; |
411 | m_flags &= ~( VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT); | 411 | m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT); |
412 | m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY | | 412 | m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY | |
413 | VehicleFlag.LIMIT_MOTOR_UP); | 413 | VehicleFlag.LIMIT_MOTOR_UP); |
414 | break; | 414 | break; |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 713269c..60ac724 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -3261,7 +3261,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3261 | d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, | 3261 | d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, |
3262 | (int) heightmapWidthSamples, (int) heightmapHeightSamples, scale, | 3262 | (int) heightmapWidthSamples, (int) heightmapHeightSamples, scale, |
3263 | offset, thickness, wrap); | 3263 | offset, thickness, wrap); |
3264 | d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1 ); | 3264 | d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1); |
3265 | LandGeom = d.CreateHeightfield(space, HeightmapData, 1); | 3265 | LandGeom = d.CreateHeightfield(space, HeightmapData, 1); |
3266 | if (LandGeom != IntPtr.Zero) | 3266 | if (LandGeom != IntPtr.Zero) |
3267 | { | 3267 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 40889ca..d812e48 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2856,7 +2856,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2856 | 2856 | ||
2857 | if (m_TransferModule != null) | 2857 | if (m_TransferModule != null) |
2858 | { | 2858 | { |
2859 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); | 2859 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
2860 | } | 2860 | } |
2861 | ScriptSleep(2000); | 2861 | ScriptSleep(2000); |
2862 | } | 2862 | } |
@@ -3668,7 +3668,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3668 | bucket); | 3668 | bucket); |
3669 | 3669 | ||
3670 | if (m_TransferModule != null) | 3670 | if (m_TransferModule != null) |
3671 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); | 3671 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
3672 | } | 3672 | } |
3673 | else | 3673 | else |
3674 | { | 3674 | { |
@@ -5968,7 +5968,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5968 | bucket); | 5968 | bucket); |
5969 | 5969 | ||
5970 | if (m_TransferModule != null) | 5970 | if (m_TransferModule != null) |
5971 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); | 5971 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
5972 | } | 5972 | } |
5973 | 5973 | ||
5974 | public void llSetVehicleType(int type) | 5974 | public void llSetVehicleType(int type) |
@@ -6008,7 +6008,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6008 | if (!m_host.ParentGroup.IsDeleted) | 6008 | if (!m_host.ParentGroup.IsDeleted) |
6009 | { | 6009 | { |
6010 | m_host.ParentGroup.RootPart.SetVehicleVectorParam(param, | 6010 | m_host.ParentGroup.RootPart.SetVehicleVectorParam(param, |
6011 | new PhysicsVector((float)vec.x, (float)vec.y, (float)vec.z) ); | 6011 | new PhysicsVector((float)vec.x, (float)vec.y, (float)vec.z)); |
6012 | } | 6012 | } |
6013 | } | 6013 | } |
6014 | } | 6014 | } |
@@ -7039,7 +7039,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7039 | return (double)Math.Log(val); | 7039 | return (double)Math.Log(val); |
7040 | } | 7040 | } |
7041 | 7041 | ||
7042 | public LSL_List llGetAnimationList( string id ) | 7042 | public LSL_List llGetAnimationList(string id) |
7043 | { | 7043 | { |
7044 | m_host.AddScriptLPS(1); | 7044 | m_host.AddScriptLPS(1); |
7045 | 7045 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 7f3db9c..73c3e4c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -586,7 +586,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
586 | 586 | ||
587 | // Check for hostname , attempt to make a hglink | 587 | // Check for hostname , attempt to make a hglink |
588 | // and convert the regionName to the target region | 588 | // and convert the regionName to the target region |
589 | if ( regionName.Contains(".") && regionName.Contains(":")) | 589 | if (regionName.Contains(".") && regionName.Contains(":")) |
590 | { | 590 | { |
591 | // Try to link the region | 591 | // Try to link the region |
592 | RegionInfo regInfo = HGHyperlink.TryLinkRegion(World, | 592 | RegionInfo regInfo = HGHyperlink.TryLinkRegion(World, |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index c8ed93c..2501752 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | |||
@@ -206,7 +206,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
206 | // DO NOT THROW JUST THE INNER EXCEPTION! | 206 | // DO NOT THROW JUST THE INNER EXCEPTION! |
207 | // FriendlyErrors depends on getting the whole exception! | 207 | // FriendlyErrors depends on getting the whole exception! |
208 | // | 208 | // |
209 | if ( !(tie.InnerException is EventAbortException) ) | 209 | if (!(tie.InnerException is EventAbortException)) |
210 | { | 210 | { |
211 | throw; | 211 | throw; |
212 | } | 212 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs index 9cdffaa..d8f44c1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs | |||
@@ -1407,7 +1407,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog | |||
1407 | throw new PrologException(Atom.a("instantiation_error"), | 1407 | throw new PrologException(Atom.a("instantiation_error"), |
1408 | "Arg 1 Char and arg 2 Code are both unbound variables"); | 1408 | "Arg 1 Char and arg 2 Code are both unbound variables"); |
1409 | 1409 | ||
1410 | return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt} ))); | 1410 | return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt}))); |
1411 | } | 1411 | } |
1412 | else | 1412 | else |
1413 | { | 1413 | { |
@@ -2343,7 +2343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog | |||
2343 | string results = ""; | 2343 | string results = ""; |
2344 | for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) | 2344 | for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) |
2345 | { | 2345 | { |
2346 | //m_log.Debug( m ); | 2346 | //m_log.Debug(m); |
2347 | results += presep+ m + postsep; | 2347 | results += presep+ m + postsep; |
2348 | } | 2348 | } |
2349 | return results; | 2349 | return results; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index 91747af..41ecfd3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | |||
@@ -676,20 +676,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
676 | 676 | ||
677 | // It's possible that we don't have an assignment, in which case | 677 | // It's possible that we don't have an assignment, in which case |
678 | // the child will be null and we only print the semicolon. | 678 | // the child will be null and we only print the semicolon. |
679 | // for ( x = 0 ; x < 10 ; x++ ) | 679 | // for (x = 0; x < 10; x++) |
680 | // ^^^^^^^ | 680 | // ^^^^^ |
681 | ForLoopStatement s = (ForLoopStatement) fl.kids.Pop(); | 681 | ForLoopStatement s = (ForLoopStatement) fl.kids.Pop(); |
682 | if (null != s) | 682 | if (null != s) |
683 | { | 683 | { |
684 | retstr += GenerateForLoopStatement(s); | 684 | retstr += GenerateForLoopStatement(s); |
685 | } | 685 | } |
686 | retstr += Generate("; "); | 686 | retstr += Generate("; "); |
687 | // for ( x = 0 ; x < 10 ; x++ ) | 687 | // for (x = 0; x < 10; x++) |
688 | // ^^^^^^^^ | 688 | // ^^^^^^ |
689 | retstr += GenerateNode((SYMBOL) fl.kids.Pop()); | 689 | retstr += GenerateNode((SYMBOL) fl.kids.Pop()); |
690 | retstr += Generate("; "); | 690 | retstr += Generate("; "); |
691 | // for ( x = 0 ; x < 10 ; x++ ) | 691 | // for (x = 0; x < 10; x++) |
692 | // ^^^^^ | 692 | // ^^^ |
693 | retstr += GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop()); | 693 | retstr += GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop()); |
694 | retstr += GenerateLine(")"); | 694 | retstr += GenerateLine(")"); |
695 | 695 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 5c7ce43..a1525b9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -573,7 +573,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
573 | display--; | 573 | display--; |
574 | 574 | ||
575 | string severity = "Error"; | 575 | string severity = "Error"; |
576 | if ( CompErr.IsWarning ) | 576 | if (CompErr.IsWarning) |
577 | { | 577 | { |
578 | severity = "Warning"; | 578 | severity = "Warning"; |
579 | } | 579 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs index cacb8be..e77b3d2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
95 | // It's possible that a child is null, for instance when the | 95 | // It's possible that a child is null, for instance when the |
96 | // assignment part in a for-loop is left out, ie: | 96 | // assignment part in a for-loop is left out, ie: |
97 | // | 97 | // |
98 | // for ( ; i < 10; i++) | 98 | // for (; i < 10; i++) |
99 | // { | 99 | // { |
100 | // ... | 100 | // ... |
101 | // } | 101 | // } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index a641605..bdacf8b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -447,7 +447,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
447 | // down-cast from Object to the correct type. | 447 | // down-cast from Object to the correct type. |
448 | // Note: no checks for item index being valid are performed | 448 | // Note: no checks for item index being valid are performed |
449 | 449 | ||
450 | public LSL_Types.LSLFloat GetLSLFloatItem( int itemIndex ) | 450 | public LSL_Types.LSLFloat GetLSLFloatItem(int itemIndex) |
451 | { | 451 | { |
452 | if (m_data[itemIndex] is LSL_Types.LSLInteger) | 452 | if (m_data[itemIndex] is LSL_Types.LSLInteger) |
453 | { | 453 | { |
diff --git a/OpenSim/Region/UserStatistics/HTMLUtil.cs b/OpenSim/Region/UserStatistics/HTMLUtil.cs index bd0c74a..c07619f 100644 --- a/OpenSim/Region/UserStatistics/HTMLUtil.cs +++ b/OpenSim/Region/UserStatistics/HTMLUtil.cs | |||
@@ -43,6 +43,7 @@ namespace OpenSim.Region.UserStatistics | |||
43 | } | 43 | } |
44 | o.Append(">\n\t"); | 44 | o.Append(">\n\t"); |
45 | } | 45 | } |
46 | |||
46 | public static void TR_C(ref StringBuilder o) | 47 | public static void TR_C(ref StringBuilder o) |
47 | { | 48 | { |
48 | o.Append("</tr>\n"); | 49 | o.Append("</tr>\n"); |
@@ -52,6 +53,7 @@ namespace OpenSim.Region.UserStatistics | |||
52 | { | 53 | { |
53 | TD_O(ref o, pclass, 0, 0); | 54 | TD_O(ref o, pclass, 0, 0); |
54 | } | 55 | } |
56 | |||
55 | public static void TD_O(ref StringBuilder o, string pclass, int rowspan, int colspan) | 57 | public static void TD_O(ref StringBuilder o, string pclass, int rowspan, int colspan) |
56 | { | 58 | { |
57 | o.Append("<td"); | 59 | o.Append("<td"); |
@@ -73,10 +75,12 @@ namespace OpenSim.Region.UserStatistics | |||
73 | } | 75 | } |
74 | o.Append(">"); | 76 | o.Append(">"); |
75 | } | 77 | } |
78 | |||
76 | public static void TD_C(ref StringBuilder o) | 79 | public static void TD_C(ref StringBuilder o) |
77 | { | 80 | { |
78 | o.Append("</td>"); | 81 | o.Append("</td>"); |
79 | } | 82 | } |
83 | |||
80 | public static void TABLE_O(ref StringBuilder o, string pclass) | 84 | public static void TABLE_O(ref StringBuilder o, string pclass) |
81 | { | 85 | { |
82 | o.Append("<table"); | 86 | o.Append("<table"); |
@@ -86,6 +90,7 @@ namespace OpenSim.Region.UserStatistics | |||
86 | } | 90 | } |
87 | o.Append(">\n\t"); | 91 | o.Append(">\n\t"); |
88 | } | 92 | } |
93 | |||
89 | public static void TABLE_C(ref StringBuilder o) | 94 | public static void TABLE_C(ref StringBuilder o) |
90 | { | 95 | { |
91 | o.Append("</table>\n"); | 96 | o.Append("</table>\n"); |
@@ -208,24 +213,22 @@ namespace OpenSim.Region.UserStatistics | |||
208 | }); | 213 | }); |
209 | // ]]> | 214 | // ]]> |
210 | </script>"); | 215 | </script>"); |
211 | |||
212 | } | 216 | } |
213 | 217 | ||
214 | public static void HtmlHeaders_O ( ref StringBuilder o) | 218 | public static void HtmlHeaders_O(ref StringBuilder o) |
215 | { | 219 | { |
216 | o.Append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"); | 220 | o.Append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"); |
217 | o.Append("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"nl\">"); | 221 | o.Append("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"nl\">"); |
218 | o.Append("<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />"); | 222 | o.Append("<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />"); |
219 | |||
220 | |||
221 | } | 223 | } |
222 | public static void HtmlHeaders_C ( ref StringBuilder o) | 224 | |
225 | public static void HtmlHeaders_C(ref StringBuilder o) | ||
223 | { | 226 | { |
224 | o.Append("</HEAD>"); | 227 | o.Append("</HEAD>"); |
225 | o.Append("<BODY>"); | 228 | o.Append("<BODY>"); |
226 | } | 229 | } |
227 | 230 | ||
228 | public static void AddReportLinks( ref StringBuilder o, Dictionary<string, IStatsController> reports, string pClass) | 231 | public static void AddReportLinks(ref StringBuilder o, Dictionary<string, IStatsController> reports, string pClass) |
229 | { | 232 | { |
230 | int repcount = 0; | 233 | int repcount = 0; |
231 | foreach (string str in reports.Keys) | 234 | foreach (string str in reports.Keys) |
@@ -242,7 +245,8 @@ namespace OpenSim.Region.UserStatistics | |||
242 | } | 245 | } |
243 | } | 246 | } |
244 | } | 247 | } |
245 | public static void A( ref StringBuilder o, string linktext, string linkhref, string pClass) | 248 | |
249 | public static void A(ref StringBuilder o, string linktext, string linkhref, string pClass) | ||
246 | { | 250 | { |
247 | o.Append("<A"); | 251 | o.Append("<A"); |
248 | if (pClass.Length > 0) | 252 | if (pClass.Length > 0) |
@@ -254,7 +258,6 @@ namespace OpenSim.Region.UserStatistics | |||
254 | o.Append("\">"); | 258 | o.Append("\">"); |
255 | o.Append(linktext); | 259 | o.Append(linktext); |
256 | o.Append("</A>"); | 260 | o.Append("</A>"); |
257 | |||
258 | } | 261 | } |
259 | } | 262 | } |
260 | } | 263 | } |
diff --git a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs index 85d2e03..811baba 100644 --- a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs +++ b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics | |||
76 | string formatopen = ""; | 76 | string formatopen = ""; |
77 | string formatclose = ""; | 77 | string formatclose = ""; |
78 | 78 | ||
79 | for (int i = 0; i < result.Length;i++ ) | 79 | for (int i = 0; i < result.Length; i++) |
80 | { | 80 | { |
81 | if (result[i].Length >= 30) | 81 | if (result[i].Length >= 30) |
82 | { | 82 | { |
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index 715d295..e383e71 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs | |||
@@ -398,7 +398,7 @@ namespace OpenSim.Region.UserStatistics | |||
398 | 398 | ||
399 | } | 399 | } |
400 | 400 | ||
401 | public string readLogLines( int amount) | 401 | public string readLogLines(int amount) |
402 | { | 402 | { |
403 | Encoding encoding = Encoding.ASCII; | 403 | Encoding encoding = Encoding.ASCII; |
404 | int sizeOfChar = encoding.GetByteCount("\n"); | 404 | int sizeOfChar = encoding.GetByteCount("\n"); |