diff options
author | Jeff Ames | 2008-05-25 23:27:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-25 23:27:38 +0000 |
commit | 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch) | |
tree | b010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Region | |
parent | * A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff) | |
download | opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2 opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to '')
21 files changed, 146 insertions, 147 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index cf12be7..dec0311 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim | |||
66 | /// The file used to load and save prim backup xml if none has been specified | 66 | /// The file used to load and save prim backup xml if none has been specified |
67 | /// </summary> | 67 | /// </summary> |
68 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; | 68 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; |
69 | 69 | ||
70 | /// <summary> | 70 | /// <summary> |
71 | /// The file use to load and save an opensim archive if none has been specified | 71 | /// The file use to load and save an opensim archive if none has been specified |
72 | /// </summary> | 72 | /// </summary> |
@@ -354,7 +354,7 @@ namespace OpenSim | |||
354 | } | 354 | } |
355 | 355 | ||
356 | /// <summary> | 356 | /// <summary> |
357 | /// Enhance the version string with extra information if it's available. | 357 | /// Enhance the version string with extra information if it's available. |
358 | /// </summary> | 358 | /// </summary> |
359 | protected void EnhanceVersionInformation() | 359 | protected void EnhanceVersionInformation() |
360 | { | 360 | { |
@@ -387,7 +387,7 @@ namespace OpenSim | |||
387 | if (!string.IsNullOrEmpty(buildVersion)) | 387 | if (!string.IsNullOrEmpty(buildVersion)) |
388 | { | 388 | { |
389 | VersionInfo.Version += ", SVN build r" + buildVersion; | 389 | VersionInfo.Version += ", SVN build r" + buildVersion; |
390 | } | 390 | } |
391 | else | 391 | else |
392 | { | 392 | { |
393 | VersionInfo.Version += ", SVN build revision not available"; | 393 | VersionInfo.Version += ", SVN build revision not available"; |
@@ -407,9 +407,9 @@ namespace OpenSim | |||
407 | if (OSString.Length > 45) | 407 | if (OSString.Length > 45) |
408 | { | 408 | { |
409 | OSString = OSString.Substring(0, 45); | 409 | OSString = OSString.Substring(0, 45); |
410 | } | 410 | } |
411 | 411 | ||
412 | VersionInfo.Version += ", OS " + OSString; | 412 | VersionInfo.Version += ", OS " + OSString; |
413 | } | 413 | } |
414 | 414 | ||
415 | /// <summary> | 415 | /// <summary> |
@@ -418,7 +418,7 @@ namespace OpenSim | |||
418 | protected void InternalStartUp() | 418 | protected void InternalStartUp() |
419 | { | 419 | { |
420 | EnhanceVersionInformation(); | 420 | EnhanceVersionInformation(); |
421 | 421 | ||
422 | m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); | 422 | m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); |
423 | 423 | ||
424 | m_stats = StatsManager.StartCollectingSimExtraStats(); | 424 | m_stats = StatsManager.StartCollectingSimExtraStats(); |
@@ -710,7 +710,7 @@ namespace OpenSim | |||
710 | /// </summary> | 710 | /// </summary> |
711 | protected class SimStatusHandler : IStreamedRequestHandler | 711 | protected class SimStatusHandler : IStreamedRequestHandler |
712 | { | 712 | { |
713 | public byte[] Handle(string path, Stream request, | 713 | public byte[] Handle(string path, Stream request, |
714 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 714 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
715 | { | 715 | { |
716 | return Encoding.UTF8.GetBytes("OK"); | 716 | return Encoding.UTF8.GetBytes("OK"); |
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index dd14c59..e4590f2 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs | |||
@@ -291,7 +291,7 @@ namespace OpenSim | |||
291 | break; | 291 | break; |
292 | case "save-xml": | 292 | case "save-xml": |
293 | m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); | 293 | m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); |
294 | 294 | ||
295 | if (cmdparams.Length > 0) | 295 | if (cmdparams.Length > 0) |
296 | { | 296 | { |
297 | m_sceneManager.SaveCurrentSceneToXml(cmdparams[0]); | 297 | m_sceneManager.SaveCurrentSceneToXml(cmdparams[0]); |
@@ -304,7 +304,7 @@ namespace OpenSim | |||
304 | 304 | ||
305 | case "load-xml": | 305 | case "load-xml": |
306 | m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); | 306 | m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); |
307 | 307 | ||
308 | LLVector3 loadOffset = new LLVector3(0, 0, 0); | 308 | LLVector3 loadOffset = new LLVector3(0, 0, 0); |
309 | if (cmdparams.Length > 0) | 309 | if (cmdparams.Length > 0) |
310 | { | 310 | { |
@@ -359,10 +359,10 @@ namespace OpenSim | |||
359 | m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); | 359 | m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); |
360 | } | 360 | } |
361 | break; | 361 | break; |
362 | 362 | ||
363 | case "save-oar": | 363 | case "save-oar": |
364 | m_log.Error("[CONSOLE]: Don't use me - I haven't yet been sufficiently implemented!"); | 364 | m_log.Error("[CONSOLE]: Don't use me - I haven't yet been sufficiently implemented!"); |
365 | 365 | ||
366 | if (cmdparams.Length > 0) | 366 | if (cmdparams.Length > 0) |
367 | { | 367 | { |
368 | m_sceneManager.SaveCurrentSceneToArchive(cmdparams[0]); | 368 | m_sceneManager.SaveCurrentSceneToArchive(cmdparams[0]); |
@@ -371,7 +371,7 @@ namespace OpenSim | |||
371 | { | 371 | { |
372 | m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); | 372 | m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); |
373 | } | 373 | } |
374 | break; | 374 | break; |
375 | 375 | ||
376 | case "plugin": | 376 | case "plugin": |
377 | m_sceneManager.SendCommandToPluginModules(cmdparams); | 377 | m_sceneManager.SendCommandToPluginModules(cmdparams); |
@@ -597,9 +597,9 @@ namespace OpenSim | |||
597 | 597 | ||
598 | case "users": | 598 | case "users": |
599 | IList agents = m_sceneManager.GetCurrentSceneAvatars(); | 599 | IList agents = m_sceneManager.GetCurrentSceneAvatars(); |
600 | 600 | ||
601 | m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); | 601 | m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); |
602 | 602 | ||
603 | m_console.Notice( | 603 | m_console.Notice( |
604 | String.Format("{0,-16}{1,-16}{2,-37}{3,-16}", "Firstname", "Lastname", | 604 | String.Format("{0,-16}{1,-16}{2,-37}{3,-16}", "Firstname", "Lastname", |
605 | "Agent ID","Region")); | 605 | "Agent ID","Region")); |
@@ -627,7 +627,7 @@ namespace OpenSim | |||
627 | presence.UUID, | 627 | presence.UUID, |
628 | regionName)); | 628 | regionName)); |
629 | } | 629 | } |
630 | 630 | ||
631 | m_console.Notice(""); | 631 | m_console.Notice(""); |
632 | break; | 632 | break; |
633 | 633 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 11fb5be..e27a003 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -98,7 +98,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
98 | 98 | ||
99 | private Dictionary<string, LLUUID> m_defaultAnimations = new Dictionary<string, LLUUID>(); | 99 | private Dictionary<string, LLUUID> m_defaultAnimations = new Dictionary<string, LLUUID>(); |
100 | 100 | ||
101 | |||
102 | /* protected variables */ | 101 | /* protected variables */ |
103 | 102 | ||
104 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = | 103 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = |
@@ -413,7 +412,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
413 | 412 | ||
414 | Thread.Sleep(2000); | 413 | Thread.Sleep(2000); |
415 | 414 | ||
416 | |||
417 | // Shut down timers | 415 | // Shut down timers |
418 | m_ackTimer.Stop(); | 416 | m_ackTimer.Stop(); |
419 | m_clientPingTimer.Stop(); | 417 | m_clientPingTimer.Stop(); |
@@ -782,7 +780,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
782 | public event TeleportLocationRequest OnSetStartLocationRequest; | 780 | public event TeleportLocationRequest OnSetStartLocationRequest; |
783 | public event UpdateAvatarProperties OnUpdateAvatarProperties; | 781 | public event UpdateAvatarProperties OnUpdateAvatarProperties; |
784 | 782 | ||
785 | |||
786 | public event CreateNewInventoryItem OnCreateNewInventoryItem; | 783 | public event CreateNewInventoryItem OnCreateNewInventoryItem; |
787 | public event CreateInventoryFolder OnCreateNewInventoryFolder; | 784 | public event CreateInventoryFolder OnCreateNewInventoryFolder; |
788 | public event UpdateInventoryFolder OnUpdateInventoryFolder; | 785 | public event UpdateInventoryFolder OnUpdateInventoryFolder; |
@@ -937,13 +934,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
937 | /// <param name="fromPos"></param> | 934 | /// <param name="fromPos"></param> |
938 | /// <param name="fromName"></param> | 935 | /// <param name="fromName"></param> |
939 | /// <param name="fromAgentID"></param> | 936 | /// <param name="fromAgentID"></param> |
940 | public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, | 937 | public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, |
941 | LLUUID fromAgentID, byte source, byte audible) | 938 | LLUUID fromAgentID, byte source, byte audible) |
942 | { | 939 | { |
943 | SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID, source, audible); | 940 | SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID, source, audible); |
944 | } | 941 | } |
945 | 942 | ||
946 | public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, | 943 | public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, |
947 | LLUUID fromAgentID, byte source, byte audible) | 944 | LLUUID fromAgentID, byte source, byte audible) |
948 | { | 945 | { |
949 | ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator); | 946 | ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator); |
@@ -3172,7 +3169,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3172 | 3169 | ||
3173 | public bool HandleObjectGroupRequest(IClientAPI sender, Packet Pack) | 3170 | public bool HandleObjectGroupRequest(IClientAPI sender, Packet Pack) |
3174 | { | 3171 | { |
3175 | 3172 | ||
3176 | ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; | 3173 | ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; |
3177 | handlerObjectGroupRequest = OnObjectGroupRequest; | 3174 | handlerObjectGroupRequest = OnObjectGroupRequest; |
3178 | if (handlerObjectGroupRequest != null) | 3175 | if (handlerObjectGroupRequest != null) |
@@ -3185,7 +3182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3185 | return true; | 3182 | return true; |
3186 | } | 3183 | } |
3187 | 3184 | ||
3188 | 3185 | ||
3189 | 3186 | ||
3190 | private bool HandleViewerEffect(IClientAPI sender, Packet Pack) | 3187 | private bool HandleViewerEffect(IClientAPI sender, Packet Pack) |
3191 | { | 3188 | { |
@@ -3875,7 +3872,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3875 | } | 3872 | } |
3876 | else | 3873 | else |
3877 | { | 3874 | { |
3878 | 3875 | ||
3879 | switch (Pack.Type) | 3876 | switch (Pack.Type) |
3880 | { | 3877 | { |
3881 | #region Scene/Avatar | 3878 | #region Scene/Avatar |
@@ -5427,10 +5424,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5427 | } | 5424 | } |
5428 | break; | 5425 | break; |
5429 | case PacketType.ParcelReturnObjects: | 5426 | case PacketType.ParcelReturnObjects: |
5430 | 5427 | ||
5431 | 5428 | ||
5432 | ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; | 5429 | ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; |
5433 | 5430 | ||
5434 | LLUUID[] puserselectedOwnerIDs = new LLUUID[parcelReturnObjects.OwnerIDs.Length]; | 5431 | LLUUID[] puserselectedOwnerIDs = new LLUUID[parcelReturnObjects.OwnerIDs.Length]; |
5435 | for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) | 5432 | for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) |
5436 | puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; | 5433 | puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; |
@@ -5444,10 +5441,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5444 | if (handlerParcelReturnObjectsRequest != null) | 5441 | if (handlerParcelReturnObjectsRequest != null) |
5445 | { | 5442 | { |
5446 | handlerParcelReturnObjectsRequest(parcelReturnObjects.ParcelData.LocalID,parcelReturnObjects.ParcelData.ReturnType,puserselectedOwnerIDs,puserselectedTaskIDs, this); | 5443 | handlerParcelReturnObjectsRequest(parcelReturnObjects.ParcelData.LocalID,parcelReturnObjects.ParcelData.ReturnType,puserselectedOwnerIDs,puserselectedTaskIDs, this); |
5447 | 5444 | ||
5448 | } | 5445 | } |
5449 | break; | 5446 | break; |
5450 | 5447 | ||
5451 | #endregion | 5448 | #endregion |
5452 | 5449 | ||
5453 | #region Estate Packets | 5450 | #region Estate Packets |
@@ -5666,7 +5663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5666 | break; | 5663 | break; |
5667 | case PacketType.LandStatRequest: | 5664 | case PacketType.LandStatRequest: |
5668 | LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; | 5665 | LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; |
5669 | 5666 | ||
5670 | handlerLandStatRequest = OnLandStatRequest; | 5667 | handlerLandStatRequest = OnLandStatRequest; |
5671 | if (handlerLandStatRequest != null) | 5668 | if (handlerLandStatRequest != null) |
5672 | { | 5669 | { |
@@ -5678,7 +5675,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5678 | //lsrp.RequestData.ReportType; // 1 = colliders, 0 = scripts | 5675 | //lsrp.RequestData.ReportType; // 1 = colliders, 0 = scripts |
5679 | //lsrp.RequestData.RequestFlags; | 5676 | //lsrp.RequestData.RequestFlags; |
5680 | //lsrp.RequestData.Filter; | 5677 | //lsrp.RequestData.Filter; |
5681 | 5678 | ||
5682 | break; | 5679 | break; |
5683 | 5680 | ||
5684 | case PacketType.RequestRegionInfo: | 5681 | case PacketType.RequestRegionInfo: |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index fb14a35..3786489 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
40 | { | 40 | { |
41 | public class LLPacketQueue : IPullStatsProvider | 41 | public class LLPacketQueue : IPullStatsProvider |
42 | { | 42 | { |
43 | private static readonly log4net.ILog m_log | 43 | private static readonly log4net.ILog m_log |
44 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private bool m_enabled = true; | 46 | private bool m_enabled = true; |
@@ -424,7 +424,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
424 | m_log.Warn("[PACKET QUEUE]: SetThrottleFromClient unexpectedly received a throttle byte array containing no elements!"); | 424 | m_log.Warn("[PACKET QUEUE]: SetThrottleFromClient unexpectedly received a throttle byte array containing no elements!"); |
425 | return; | 425 | return; |
426 | } | 426 | } |
427 | 427 | ||
428 | int tResend = -1; | 428 | int tResend = -1; |
429 | int tLand = -1; | 429 | int tLand = -1; |
430 | int tWind = -1; | 430 | int tWind = -1; |
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 6ecae06..7ddd072 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Region.DataSnapshot | |||
60 | 60 | ||
61 | //Register CAPS handler event | 61 | //Register CAPS handler event |
62 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; | 62 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; |
63 | 63 | ||
64 | //harbl | 64 | //harbl |
65 | } | 65 | } |
66 | 66 | ||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.DataSnapshot | |||
72 | new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt)); | 72 | new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt)); |
73 | } | 73 | } |
74 | 74 | ||
75 | public string OnDiscoveryAttempt(string request, string path, string param, | 75 | public string OnDiscoveryAttempt(string request, string path, string param, |
76 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 76 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
77 | { | 77 | { |
78 | //Very static for now, flexible enough to add new formats | 78 | //Very static for now, flexible enough to add new formats |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.DataSnapshot | |||
82 | LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL(); | 82 | LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL(); |
83 | llsd_dataurl.snapshot_format = "os-datasnapshot-v1"; | 83 | llsd_dataurl.snapshot_format = "os-datasnapshot-v1"; |
84 | llsd_dataurl.snapshot_url = "http://" + m_externalData.m_hostname + ":" + m_externalData.m_listener_port + "/?method=collector"; | 84 | llsd_dataurl.snapshot_url = "http://" + m_externalData.m_hostname + ":" + m_externalData.m_listener_port + "/?method=collector"; |
85 | 85 | ||
86 | llsd_response.snapshot_resources.Array.Add(llsd_dataurl); | 86 | llsd_response.snapshot_resources.Array.Add(llsd_dataurl); |
87 | 87 | ||
88 | string response = LLSDHelpers.SerialiseLLSDReply(llsd_response); | 88 | string response = LLSDHelpers.SerialiseLLSDReply(llsd_response); |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 8216222..9730b02 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
43 | { | 43 | { |
44 | public class ChatModule : IRegionModule, ISimChat | 44 | public class ChatModule : IRegionModule, ISimChat |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private const int DEBUG_CHANNEL = 2147483647; | 49 | private const int DEBUG_CHANNEL = 2147483647; |
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
115 | 115 | ||
116 | // Filled in since it's easier than rewriting right now. | 116 | // Filled in since it's easier than rewriting right now. |
117 | LLVector3 fromPos = e.Position; | 117 | LLVector3 fromPos = e.Position; |
118 | LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, | 118 | LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, |
119 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); | 119 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); |
120 | 120 | ||
121 | string fromName = e.From; | 121 | string fromName = e.From; |
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
130 | if (avatar != null) | 130 | if (avatar != null) |
131 | { | 131 | { |
132 | fromPos = avatar.AbsolutePosition; | 132 | fromPos = avatar.AbsolutePosition; |
133 | regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, | 133 | regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, |
134 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); | 134 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); |
135 | fromName = avatar.Firstname + " " + avatar.Lastname; | 135 | fromName = avatar.Firstname + " " + avatar.Lastname; |
136 | fromAgentID = e.Sender.AgentId; | 136 | fromAgentID = e.Sender.AgentId; |
@@ -151,13 +151,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
151 | if (e.Channel == DEBUG_CHANNEL) | 151 | if (e.Channel == DEBUG_CHANNEL) |
152 | { | 152 | { |
153 | TrySendChatMessage(presence, fromPos, regionPos, | 153 | TrySendChatMessage(presence, fromPos, regionPos, |
154 | fromAgentID, fromName, e.Type, | 154 | fromAgentID, fromName, e.Type, |
155 | message, ChatSourceType.Object); | 155 | message, ChatSourceType.Object); |
156 | } | 156 | } |
157 | else | 157 | else |
158 | { | 158 | { |
159 | TrySendChatMessage(presence, fromPos, regionPos, | 159 | TrySendChatMessage(presence, fromPos, regionPos, |
160 | fromAgentID, fromName, e.Type, | 160 | fromAgentID, fromName, e.Type, |
161 | message, ChatSourceType.Agent); | 161 | message, ChatSourceType.Agent); |
162 | } | 162 | } |
163 | }); | 163 | }); |
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
180 | } | 180 | } |
181 | 181 | ||
182 | private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos, | 182 | private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos, |
183 | LLUUID fromAgentID, string fromName, ChatTypeEnum type, | 183 | LLUUID fromAgentID, string fromName, ChatTypeEnum type, |
184 | string message, ChatSourceType src) | 184 | string message, ChatSourceType src) |
185 | { | 185 | { |
186 | if (!presence.IsChildAgent) | 186 | if (!presence.IsChildAgent) |
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
188 | LLVector3 fromRegionPos = fromPos + regionPos; | 188 | LLVector3 fromRegionPos = fromPos + regionPos; |
189 | LLVector3 toRegionPos = presence.AbsolutePosition + regionPos; | 189 | LLVector3 toRegionPos = presence.AbsolutePosition + regionPos; |
190 | int dis = Math.Abs((int) Util.GetDistanceTo(toRegionPos, fromRegionPos)); | 190 | int dis = Math.Abs((int) Util.GetDistanceTo(toRegionPos, fromRegionPos)); |
191 | 191 | ||
192 | if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || | 192 | if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || |
193 | type == ChatTypeEnum.Say && dis > m_saydistance || | 193 | type == ChatTypeEnum.Say && dis > m_saydistance || |
194 | type == ChatTypeEnum.Shout && dis > m_shoutdistance) | 194 | type == ChatTypeEnum.Shout && dis > m_shoutdistance) |
@@ -197,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
197 | } | 197 | } |
198 | 198 | ||
199 | // TODO: should change so the message is sent through the avatar rather than direct to the ClientView | 199 | // TODO: should change so the message is sent through the avatar rather than direct to the ClientView |
200 | presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, | 200 | presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, |
201 | fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); | 201 | fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); |
202 | } | 202 | } |
203 | } | 203 | } |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index 03f9a88..283551b 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
43 | { | 43 | { |
44 | public class IRCBridgeModule : IRegionModule, ISimChat | 44 | public class IRCBridgeModule : IRegionModule, ISimChat |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private const int DEBUG_CHANNEL = 2147483647; | 49 | private const int DEBUG_CHANNEL = 2147483647; |
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
94 | m_irc_connector.Name = "IRCConnectorThread"; | 94 | m_irc_connector.Name = "IRCConnectorThread"; |
95 | m_irc_connector.IsBackground = true; | 95 | m_irc_connector.IsBackground = true; |
96 | } | 96 | } |
97 | m_log.InfoFormat("[IRC] initialized for {0}, nick: {1} ", scene.RegionInfo.RegionName, | 97 | m_log.InfoFormat("[IRC] initialized for {0}, nick: {1} ", scene.RegionInfo.RegionName, |
98 | m_defaultzone); | 98 | m_defaultzone); |
99 | } | 99 | } |
100 | } | 100 | } |
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
222 | if ((m_irc.Enabled) && (m_irc.Connected)) | 222 | if ((m_irc.Enabled) && (m_irc.Connected)) |
223 | { | 223 | { |
224 | m_log.DebugFormat("[IRC] {0} logging on", clientName); | 224 | m_log.DebugFormat("[IRC] {0} logging on", clientName); |
225 | m_irc.PrivMsg(m_irc.Nick, "Sim", | 225 | m_irc.PrivMsg(m_irc.Nick, "Sim", |
226 | String.Format("notices {0} logging on", clientName)); | 226 | String.Format("notices {0} logging on", clientName)); |
227 | } | 227 | } |
228 | m_last_new_user = clientName; | 228 | m_last_new_user = clientName; |
@@ -288,7 +288,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
288 | m_log.InfoFormat("[IRC]: {0} logging out", clientName); | 288 | m_log.InfoFormat("[IRC]: {0} logging out", clientName); |
289 | } | 289 | } |
290 | 290 | ||
291 | if (m_last_new_user == clientName) | 291 | if (m_last_new_user == clientName) |
292 | m_last_new_user = null; | 292 | m_last_new_user = null; |
293 | } | 293 | } |
294 | } | 294 | } |
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
588 | if (!avatar.IsChildAgent) | 588 | if (!avatar.IsChildAgent) |
589 | { | 589 | { |
590 | avatar.ControllingClient.SendChatMessage( | 590 | avatar.ControllingClient.SendChatMessage( |
591 | Helpers.StringToField(data["msg"]), | 591 | Helpers.StringToField(data["msg"]), |
592 | 1, // 255, | 592 | 1, // 255, |
593 | pos, data["nick"], | 593 | pos, data["nick"], |
594 | LLUUID.Zero,(byte)ChatSourceType.Agent,(byte)ChatAudibleLevel.Fully); | 594 | LLUUID.Zero,(byte)ChatSourceType.Agent,(byte)ChatAudibleLevel.Fully); |
@@ -634,9 +634,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
634 | if (!avatar.IsChildAgent) | 634 | if (!avatar.IsChildAgent) |
635 | { | 635 | { |
636 | avatar.ControllingClient.SendChatMessage( | 636 | avatar.ControllingClient.SendChatMessage( |
637 | Helpers.StringToField(String.Format(format, args)), | 637 | Helpers.StringToField(String.Format(format, args)), |
638 | 1, //255, | 638 | 1, //255, |
639 | pos, sender, LLUUID.Zero, | 639 | pos, sender, LLUUID.Zero, |
640 | (byte)ChatSourceType.Object, | 640 | (byte)ChatSourceType.Object, |
641 | (byte)ChatAudibleLevel.Fully); | 641 | (byte)ChatAudibleLevel.Fully); |
642 | } | 642 | } |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index 2e8a8da..80936f6 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs | |||
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice | |||
131 | string capsBase = "/CAPS/" + caps.CapsObjectPath; | 131 | string capsBase = "/CAPS/" + caps.CapsObjectPath; |
132 | caps.RegisterHandler("ParcelVoiceInfoRequest", | 132 | caps.RegisterHandler("ParcelVoiceInfoRequest", |
133 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, | 133 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, |
134 | delegate(string request, string path, string param, | 134 | delegate(string request, string path, string param, |
135 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 135 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
136 | { | 136 | { |
137 | return ParcelVoiceInfoRequest(request, path, param, | 137 | return ParcelVoiceInfoRequest(request, path, param, |
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice | |||
139 | })); | 139 | })); |
140 | caps.RegisterHandler("ProvisionVoiceAccountRequest", | 140 | caps.RegisterHandler("ProvisionVoiceAccountRequest", |
141 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, | 141 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, |
142 | delegate(string request, string path, string param, | 142 | delegate(string request, string path, string param, |
143 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 143 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
144 | { | 144 | { |
145 | return ProvisionVoiceAccountRequest(request, path, param, | 145 | return ProvisionVoiceAccountRequest(request, path, param, |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs index 77f761f..865894e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice | |||
104 | string capsBase = "/CAPS/" + caps.CapsObjectPath; | 104 | string capsBase = "/CAPS/" + caps.CapsObjectPath; |
105 | caps.RegisterHandler("ParcelVoiceInfoRequest", | 105 | caps.RegisterHandler("ParcelVoiceInfoRequest", |
106 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, | 106 | new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, |
107 | delegate(string request, string path, string param, | 107 | delegate(string request, string path, string param, |
108 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 108 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
109 | { | 109 | { |
110 | return ParcelVoiceInfoRequest(request, path, param, | 110 | return ParcelVoiceInfoRequest(request, path, param, |
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice | |||
112 | })); | 112 | })); |
113 | caps.RegisterHandler("ProvisionVoiceAccountRequest", | 113 | caps.RegisterHandler("ProvisionVoiceAccountRequest", |
114 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, | 114 | new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, |
115 | delegate(string request, string path, string param, | 115 | delegate(string request, string path, string param, |
116 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 116 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
117 | { | 117 | { |
118 | return ProvisionVoiceAccountRequest(request, path, param, | 118 | return ProvisionVoiceAccountRequest(request, path, param, |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs index 27f16a7..7016d1b 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
39 | /// This module loads and saves OpenSimulator archives | 39 | /// This module loads and saves OpenSimulator archives |
40 | /// </summary> | 40 | /// </summary> |
41 | public class ArchiverModule : IRegionModule, IRegionArchiver | 41 | public class ArchiverModule : IRegionModule, IRegionArchiver |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
@@ -47,51 +47,51 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
47 | /// </summary> | 47 | /// </summary> |
48 | /// <param name="scene"></param> | 48 | /// <param name="scene"></param> |
49 | /// <param name="source"></param> | 49 | /// <param name="source"></param> |
50 | private Scene m_scene; | 50 | private Scene m_scene; |
51 | 51 | ||
52 | public string Name { get { return "ArchiverModule"; } } | 52 | public string Name { get { return "ArchiverModule"; } } |
53 | 53 | ||
54 | public bool IsSharedModule { get { return false; } } | 54 | public bool IsSharedModule { get { return false; } } |
55 | 55 | ||
56 | public void Initialise(Scene scene, IConfigSource source) | 56 | public void Initialise(Scene scene, IConfigSource source) |
57 | { | 57 | { |
58 | m_scene = scene; | 58 | m_scene = scene; |
59 | 59 | ||
60 | m_scene.RegisterModuleInterface<IRegionArchiver>(this); | 60 | m_scene.RegisterModuleInterface<IRegionArchiver>(this); |
61 | } | 61 | } |
62 | 62 | ||
63 | public void PostInitialise() | 63 | public void PostInitialise() |
64 | { | 64 | { |
65 | } | 65 | } |
66 | 66 | ||
67 | public void Close() | 67 | public void Close() |
68 | { | 68 | { |
69 | } | 69 | } |
70 | 70 | ||
71 | public void ArchiveRegion(string savePath) | 71 | public void ArchiveRegion(string savePath) |
72 | { | 72 | { |
73 | m_log.Warn("[ARCHIVER]: Archive region not yet implemented"); | 73 | m_log.Warn("[ARCHIVER]: Archive region not yet implemented"); |
74 | 74 | ||
75 | List<EntityBase> entities = m_scene.GetEntities(); | 75 | List<EntityBase> entities = m_scene.GetEntities(); |
76 | 76 | ||
77 | foreach (EntityBase entity in entities) | 77 | foreach (EntityBase entity in entities) |
78 | { | 78 | { |
79 | 79 | ||
80 | } | 80 | } |
81 | 81 | ||
82 | string serEntities = SerializeObjects(entities); | 82 | string serEntities = SerializeObjects(entities); |
83 | 83 | ||
84 | if (serEntities != null && serEntities.Length > 0) | 84 | if (serEntities != null && serEntities.Length > 0) |
85 | { | 85 | { |
86 | m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count); | 86 | m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | 89 | ||
90 | public void DearchiveRegion(string loadPath) | 90 | public void DearchiveRegion(string loadPath) |
91 | { | 91 | { |
92 | m_log.Warn("[ARCHIVER]: Dearchive region not yet implemented"); | 92 | m_log.Warn("[ARCHIVER]: Dearchive region not yet implemented"); |
93 | } | 93 | } |
94 | 94 | ||
95 | /// <summary> | 95 | /// <summary> |
96 | /// Get an xml representation of the given scene objects. | 96 | /// Get an xml representation of the given scene objects. |
97 | /// </summary> | 97 | /// </summary> |
@@ -115,8 +115,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
115 | serialization += serObject; | 115 | serialization += serObject; |
116 | 116 | ||
117 | serialization += "</scene>"; | 117 | serialization += "</scene>"; |
118 | 118 | ||
119 | return serialization; | 119 | return serialization; |
120 | } | 120 | } |
121 | } | 121 | } |
122 | } \ No newline at end of file | 122 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs index 485cf02..b949666 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using OpenSim.Region.Environment.Scenes; | 28 | using OpenSim.Region.Environment.Scenes; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 30 | namespace OpenSim.Region.Environment.Modules.World.Archiver |
31 | { | 31 | { |
32 | /// <summary> | 32 | /// <summary> |
33 | /// Interface to region archive functionality | 33 | /// Interface to region archive functionality |
34 | /// </summary> | 34 | /// </summary> |
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
39 | /// </summary> | 39 | /// </summary> |
40 | /// <param name="savePath"></param> | 40 | /// <param name="savePath"></param> |
41 | void ArchiveRegion(string savePath); | 41 | void ArchiveRegion(string savePath); |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Dearchive the given region archive into the scene | 44 | /// Dearchive the given region archive into the scene |
45 | /// </summary> | 45 | /// </summary> |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 2f4f971..f5b1a1d 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -731,7 +731,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
731 | if (obj.OwnerID == owners[i]) | 731 | if (obj.OwnerID == owners[i]) |
732 | objlist.Add(obj); | 732 | objlist.Add(obj); |
733 | } | 733 | } |
734 | } | 734 | } |
735 | catch (InvalidOperationException) | 735 | catch (InvalidOperationException) |
736 | { | 736 | { |
737 | m_log.Info("[PARCEL]: Unable to figure out all the objects owned by " + owners[i].ToString() + " arr."); | 737 | m_log.Info("[PARCEL]: Unable to figure out all the objects owned by " + owners[i].ToString() + " arr."); |
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
751 | landData.ownerPrims = 0; | 751 | landData.ownerPrims = 0; |
752 | landData.otherPrims = 0; | 752 | landData.otherPrims = 0; |
753 | landData.selectedPrims = 0; | 753 | landData.selectedPrims = 0; |
754 | 754 | ||
755 | 755 | ||
756 | lock (primsOverMe) | 756 | lock (primsOverMe) |
757 | primsOverMe.Clear(); | 757 | primsOverMe.Clear(); |
@@ -759,7 +759,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
759 | 759 | ||
760 | public void addPrimToCount(SceneObjectGroup obj) | 760 | public void addPrimToCount(SceneObjectGroup obj) |
761 | { | 761 | { |
762 | 762 | ||
763 | LLUUID prim_owner = obj.OwnerID; | 763 | LLUUID prim_owner = obj.OwnerID; |
764 | int prim_count = obj.PrimCount; | 764 | int prim_count = obj.PrimCount; |
765 | 765 | ||
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index d6e905b..0405bdf 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -1448,12 +1448,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1448 | Entities.Add(copy.UUID, copy); | 1448 | Entities.Add(copy.UUID, copy); |
1449 | } | 1449 | } |
1450 | 1450 | ||
1451 | // Since we copy from a source group that is in selected | 1451 | // Since we copy from a source group that is in selected |
1452 | // state, but the copy is shown deselected in the viewer, | 1452 | // state, but the copy is shown deselected in the viewer, |
1453 | // We need to clear the selection flag here, else that | 1453 | // We need to clear the selection flag here, else that |
1454 | // prim never gets persisted at all. The client doesn't | 1454 | // prim never gets persisted at all. The client doesn't |
1455 | // think it's selected, so it will never send a deselect... | 1455 | // think it's selected, so it will never send a deselect... |
1456 | copy.IsSelected=false; | 1456 | copy.IsSelected = false; |
1457 | 1457 | ||
1458 | m_numPrim++; | 1458 | m_numPrim++; |
1459 | 1459 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 4d19d72..f27d0ab 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -1078,7 +1078,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1078 | } | 1078 | } |
1079 | } | 1079 | } |
1080 | 1080 | ||
1081 | 1081 | ||
1082 | /// <summary> | 1082 | /// <summary> |
1083 | /// Called when an object is removed from the environment into inventory. | 1083 | /// Called when an object is removed from the environment into inventory. |
1084 | /// </summary> | 1084 | /// </summary> |
@@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1087 | public virtual void DeRezObject(Packet packet, IClientAPI remoteClient) | 1087 | public virtual void DeRezObject(Packet packet, IClientAPI remoteClient) |
1088 | { | 1088 | { |
1089 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet; | 1089 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet; |
1090 | 1090 | ||
1091 | LLUUID folderID = LLUUID.Zero; | 1091 | LLUUID folderID = LLUUID.Zero; |
1092 | 1092 | ||
1093 | foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) | 1093 | foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) |
@@ -1128,7 +1128,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1128 | 1128 | ||
1129 | else if (DeRezPacket.AgentBlock.Destination == 6) //Delete | 1129 | else if (DeRezPacket.AgentBlock.Destination == 6) //Delete |
1130 | { | 1130 | { |
1131 | permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); | 1131 | permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); |
1132 | permissionToDelete = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); | 1132 | permissionToDelete = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); |
1133 | } | 1133 | } |
1134 | else if (DeRezPacket.AgentBlock.Destination == 9) //Return | 1134 | else if (DeRezPacket.AgentBlock.Destination == 9) //Return |
@@ -1251,7 +1251,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1251 | DeleteSceneObject(objectGroup); | 1251 | DeleteSceneObject(objectGroup); |
1252 | } | 1252 | } |
1253 | } | 1253 | } |
1254 | } | 1254 | } |
1255 | } | 1255 | } |
1256 | 1256 | ||
1257 | public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID) | 1257 | public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID) |
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1494 | } | 1494 | } |
1495 | 1495 | ||
1496 | group.ResetIDs(); | 1496 | group.ResetIDs(); |
1497 | 1497 | ||
1498 | AddSceneObject(group); | 1498 | AddSceneObject(group); |
1499 | 1499 | ||
1500 | // if attachment we set it's asset id so object updates can reflect that | 1500 | // if attachment we set it's asset id so object updates can reflect that |
@@ -1583,7 +1583,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1583 | } | 1583 | } |
1584 | } | 1584 | } |
1585 | } | 1585 | } |
1586 | 1586 | ||
1587 | return null; | 1587 | return null; |
1588 | } | 1588 | } |
1589 | 1589 | ||
@@ -1606,7 +1606,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1606 | return null; | 1606 | return null; |
1607 | } | 1607 | } |
1608 | group.ResetIDs(); | 1608 | group.ResetIDs(); |
1609 | 1609 | ||
1610 | AddSceneObject(group); | 1610 | AddSceneObject(group); |
1611 | 1611 | ||
1612 | // Set the startup parameter for on_rez event and llGetStartParameter() function | 1612 | // Set the startup parameter for on_rez event and llGetStartParameter() function |
@@ -1674,7 +1674,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1674 | if (returnobjects.Length <= 0) | 1674 | if (returnobjects.Length <= 0) |
1675 | return false; | 1675 | return false; |
1676 | 1676 | ||
1677 | // for the moment we're going to store them individually.. however, in the future, the rezObject | 1677 | // for the moment we're going to store them individually.. however, in the future, the rezObject |
1678 | // will be able to have more items. | 1678 | // will be able to have more items. |
1679 | 1679 | ||
1680 | //string returnstring = ""; | 1680 | //string returnstring = ""; |
@@ -1684,9 +1684,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1684 | // returnstring += grp.ToXmlString2(); | 1684 | // returnstring += grp.ToXmlString2(); |
1685 | //} | 1685 | //} |
1686 | //returnstring += "</scene>\n"; | 1686 | //returnstring += "</scene>\n"; |
1687 | |||
1688 | 1687 | ||
1689 | 1688 | ||
1689 | |||
1690 | 1690 | ||
1691 | bool permissionToDelete = false; | 1691 | bool permissionToDelete = false; |
1692 | 1692 | ||
@@ -1697,7 +1697,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1697 | if (userInfo == null) | 1697 | if (userInfo == null) |
1698 | { | 1698 | { |
1699 | CommsManager.UserProfileCacheService.AddNewUser(returnobjects[i].OwnerID); | 1699 | CommsManager.UserProfileCacheService.AddNewUser(returnobjects[i].OwnerID); |
1700 | 1700 | ||
1701 | } | 1701 | } |
1702 | if (userInfo != null) | 1702 | if (userInfo != null) |
1703 | { | 1703 | { |
@@ -1807,7 +1807,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1807 | returningavatar.ControllingClient.SendAlertMessage(message); | 1807 | returningavatar.ControllingClient.SendAlertMessage(message); |
1808 | } | 1808 | } |
1809 | return false; | 1809 | return false; |
1810 | } | 1810 | } |
1811 | return true; | 1811 | return true; |
1812 | 1812 | ||
1813 | } | 1813 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1e88018..27431ed 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
86 | private int m_incrementsof15seconds = 0; | 86 | private int m_incrementsof15seconds = 0; |
87 | private volatile bool m_backingup = false; | 87 | private volatile bool m_backingup = false; |
88 | 88 | ||
89 | protected string m_simulatorVersion = "unknown"; | 89 | protected string m_simulatorVersion = "unknown"; |
90 | 90 | ||
91 | protected ModuleLoader m_moduleLoader; | 91 | protected ModuleLoader m_moduleLoader; |
92 | protected StorageManager m_storageManager; | 92 | protected StorageManager m_storageManager; |
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
218 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, | 218 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, |
219 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 219 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
220 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, | 220 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, |
221 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 221 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
222 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 222 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
223 | { | 223 | { |
224 | m_config = config; | 224 | m_config = config; |
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
287 | m_statsReporter.SetObjectCapacity(objectCapacity); | 287 | m_statsReporter.SetObjectCapacity(objectCapacity); |
288 | 288 | ||
289 | m_simulatorVersion = simulatorVersion | 289 | m_simulatorVersion = simulatorVersion |
290 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() | 290 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() |
291 | + " PhysPrim:" + m_physicalPrim.ToString(); | 291 | + " PhysPrim:" + m_physicalPrim.ToString(); |
292 | } | 292 | } |
293 | 293 | ||
@@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1322 | /// <summary> | 1322 | /// <summary> |
1323 | /// Add an object into the scene that has come from storage | 1323 | /// Add an object into the scene that has come from storage |
1324 | /// </summary> | 1324 | /// </summary> |
1325 | /// <param name="sceneObject"></param> | 1325 | /// <param name="sceneObject"></param> |
1326 | public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject) | 1326 | public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject) |
1327 | { | 1327 | { |
1328 | m_innerScene.AddSceneObjectFromStorage(sceneObject); | 1328 | m_innerScene.AddSceneObjectFromStorage(sceneObject); |
@@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1335 | public void AddSceneObject(SceneObjectGroup sceneObject) | 1335 | public void AddSceneObject(SceneObjectGroup sceneObject) |
1336 | { | 1336 | { |
1337 | m_innerScene.AddSceneObject(sceneObject); | 1337 | m_innerScene.AddSceneObject(sceneObject); |
1338 | } | 1338 | } |
1339 | 1339 | ||
1340 | /// <summary> | 1340 | /// <summary> |
1341 | /// Delete this object from the scene. | 1341 | /// Delete this object from the scene. |
@@ -1344,20 +1344,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
1344 | public void DeleteSceneObject(SceneObjectGroup group) | 1344 | public void DeleteSceneObject(SceneObjectGroup group) |
1345 | { | 1345 | { |
1346 | SceneObjectPart rootPart = (group).GetChildPart(group.UUID); | 1346 | SceneObjectPart rootPart = (group).GetChildPart(group.UUID); |
1347 | 1347 | ||
1348 | if (rootPart.PhysActor != null) | 1348 | if (rootPart.PhysActor != null) |
1349 | { | 1349 | { |
1350 | PhysicsScene.RemovePrim(rootPart.PhysActor); | 1350 | PhysicsScene.RemovePrim(rootPart.PhysActor); |
1351 | rootPart.PhysActor = null; | 1351 | rootPart.PhysActor = null; |
1352 | } | 1352 | } |
1353 | 1353 | ||
1354 | if (UnlinkSceneObject(group.UUID)) | 1354 | if (UnlinkSceneObject(group.UUID)) |
1355 | { | 1355 | { |
1356 | EventManager.TriggerObjectBeingRemovedFromScene(group); | 1356 | EventManager.TriggerObjectBeingRemovedFromScene(group); |
1357 | EventManager.TriggerParcelPrimCountTainted(); | 1357 | EventManager.TriggerParcelPrimCountTainted(); |
1358 | } | 1358 | } |
1359 | 1359 | ||
1360 | group.DeleteGroup(); | 1360 | group.DeleteGroup(); |
1361 | group.DeleteParts(); | 1361 | group.DeleteParts(); |
1362 | 1362 | ||
1363 | // In case anybody else retains a reference to this group, signal deletion by changing the name | 1363 | // In case anybody else retains a reference to this group, signal deletion by changing the name |
@@ -1367,8 +1367,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1367 | // conditions where a user deletes an entity while it is being stored. Really, the update | 1367 | // conditions where a user deletes an entity while it is being stored. Really, the update |
1368 | // code needs a redesign. | 1368 | // code needs a redesign. |
1369 | group.Name = null; | 1369 | group.Name = null; |
1370 | } | 1370 | } |
1371 | 1371 | ||
1372 | /// <summary> | 1372 | /// <summary> |
1373 | /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the | 1373 | /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the |
1374 | /// object itself is not destroyed. | 1374 | /// object itself is not destroyed. |
@@ -1376,14 +1376,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
1376 | /// <param name="uuid"></param> | 1376 | /// <param name="uuid"></param> |
1377 | /// <returns>true if the object was in the scene, false if it was not</returns> | 1377 | /// <returns>true if the object was in the scene, false if it was not</returns> |
1378 | public bool UnlinkSceneObject(LLUUID uuid) | 1378 | public bool UnlinkSceneObject(LLUUID uuid) |
1379 | { | 1379 | { |
1380 | if (m_innerScene.DeleteSceneObject(uuid)) | 1380 | if (m_innerScene.DeleteSceneObject(uuid)) |
1381 | { | 1381 | { |
1382 | m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); | 1382 | m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); |
1383 | 1383 | ||
1384 | return true; | 1384 | return true; |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | return false; | 1387 | return false; |
1388 | } | 1388 | } |
1389 | 1389 | ||
@@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1406 | { | 1406 | { |
1407 | m_sceneXmlLoader.SavePrimsToXml2(fileName); | 1407 | m_sceneXmlLoader.SavePrimsToXml2(fileName); |
1408 | } | 1408 | } |
1409 | 1409 | ||
1410 | /// <summary> | 1410 | /// <summary> |
1411 | /// Load a prim archive into the scene. This loads both prims and their assets. | 1411 | /// Load a prim archive into the scene. This loads both prims and their assets. |
1412 | /// </summary> | 1412 | /// </summary> |
@@ -1416,7 +1416,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1416 | IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>(); | 1416 | IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>(); |
1417 | archiver.DearchiveRegion(filePath); | 1417 | archiver.DearchiveRegion(filePath); |
1418 | } | 1418 | } |
1419 | 1419 | ||
1420 | /// <summary> | 1420 | /// <summary> |
1421 | /// Save the prims in the scene to an archive. This saves both prims and their assets. | 1421 | /// Save the prims in the scene to an archive. This saves both prims and their assets. |
1422 | /// </summary> | 1422 | /// </summary> |
@@ -1825,7 +1825,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1825 | 1825 | ||
1826 | protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) | 1826 | protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) |
1827 | { | 1827 | { |
1828 | 1828 | ||
1829 | AvatarAppearance appearance = null; | 1829 | AvatarAppearance appearance = null; |
1830 | GetAvatarAppearance(client, out appearance); | 1830 | GetAvatarAppearance(client, out appearance); |
1831 | 1831 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index eae041b..66174bf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
176 | { | 176 | { |
177 | CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset); | 177 | CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset); |
178 | } | 178 | } |
179 | 179 | ||
180 | /// <summary> | 180 | /// <summary> |
181 | /// Save the prims in the current scene to an xml file in OpenSimulator's current 'xml2' format | 181 | /// Save the prims in the current scene to an xml file in OpenSimulator's current 'xml2' format |
182 | /// </summary> | 182 | /// </summary> |
@@ -188,12 +188,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
188 | 188 | ||
189 | /// <summary> | 189 | /// <summary> |
190 | /// Load an xml file of prims in OpenSimulator's current 'xml2' file format to the current scene | 190 | /// Load an xml file of prims in OpenSimulator's current 'xml2' file format to the current scene |
191 | /// </summary> | 191 | /// </summary> |
192 | public void LoadCurrentSceneFromXml2(string filename) | 192 | public void LoadCurrentSceneFromXml2(string filename) |
193 | { | 193 | { |
194 | CurrentOrFirstScene.LoadPrimsFromXml2(filename); | 194 | CurrentOrFirstScene.LoadPrimsFromXml2(filename); |
195 | } | 195 | } |
196 | 196 | ||
197 | /// <summary> | 197 | /// <summary> |
198 | /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets | 198 | /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets |
199 | /// as well as the details of the prims themselves. | 199 | /// as well as the details of the prims themselves. |
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
203 | { | 203 | { |
204 | CurrentOrFirstScene.SavePrimsToArchive(filename); | 204 | CurrentOrFirstScene.SavePrimsToArchive(filename); |
205 | } | 205 | } |
206 | 206 | ||
207 | /// <summary> | 207 | /// <summary> |
208 | /// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload | 208 | /// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload |
209 | /// their assets to the asset service. | 209 | /// their assets to the asset service. |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index cd4be99..2ad01f9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -271,11 +271,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
271 | get { return m_rootPart.Text; } | 271 | get { return m_rootPart.Text; } |
272 | set { m_rootPart.Text = value; } | 272 | set { m_rootPart.Text = value; } |
273 | } | 273 | } |
274 | 274 | ||
275 | protected virtual bool InSceneBackup | 275 | protected virtual bool InSceneBackup |
276 | { | 276 | { |
277 | get { return true; } | 277 | get { return true; } |
278 | } | 278 | } |
279 | 279 | ||
280 | public bool IsSelected | 280 | public bool IsSelected |
281 | { | 281 | { |
@@ -523,11 +523,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
523 | { | 523 | { |
524 | // m_log.DebugFormat( | 524 | // m_log.DebugFormat( |
525 | // "[SCENE OBJECT GROUP]: Attaching object {0} to scene presistence sweep", UUID); | 525 | // "[SCENE OBJECT GROUP]: Attaching object {0} to scene presistence sweep", UUID); |
526 | 526 | ||
527 | m_scene.EventManager.OnBackup += ProcessBackup; | 527 | m_scene.EventManager.OnBackup += ProcessBackup; |
528 | } | 528 | } |
529 | } | 529 | } |
530 | 530 | ||
531 | public LLVector3 GroupScale() | 531 | public LLVector3 GroupScale() |
532 | { | 532 | { |
533 | LLVector3 minScale = new LLVector3(Constants.RegionSize,Constants.RegionSize,Constants.RegionSize); | 533 | LLVector3 minScale = new LLVector3(Constants.RegionSize,Constants.RegionSize,Constants.RegionSize); |
@@ -1079,21 +1079,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
1079 | /// </summary> | 1079 | /// </summary> |
1080 | /// <param name="datastore"></param> | 1080 | /// <param name="datastore"></param> |
1081 | public void ProcessBackup(IRegionDataStore datastore) | 1081 | public void ProcessBackup(IRegionDataStore datastore) |
1082 | { | 1082 | { |
1083 | // don't backup while it's selected or you're asking for changes mid stream. | 1083 | // don't backup while it's selected or you're asking for changes mid stream. |
1084 | if (HasGroupChanged) | 1084 | if (HasGroupChanged) |
1085 | { | 1085 | { |
1086 | if ((!IsSelected) && (RootPart != null)) | 1086 | if ((!IsSelected) && (RootPart != null)) |
1087 | { | 1087 | { |
1088 | m_log.InfoFormat("[SCENE OBJECT GROUP]: Storing object {0}", UUID); | 1088 | m_log.InfoFormat("[SCENE OBJECT GROUP]: Storing object {0}", UUID); |
1089 | 1089 | ||
1090 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); | 1090 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); |
1091 | 1091 | ||
1092 | datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); | 1092 | datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); |
1093 | HasGroupChanged = false; | 1093 | HasGroupChanged = false; |
1094 | 1094 | ||
1095 | backup_group.ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); | 1095 | backup_group.ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); |
1096 | 1096 | ||
1097 | backup_group = null; | 1097 | backup_group = null; |
1098 | } | 1098 | } |
1099 | // else | 1099 | // else |
@@ -1102,10 +1102,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1102 | // "[SCENE OBJECT GROUP]: Did not update persistence of object {0} since it was still selected by an avatar during the backup sweep", UUID); | 1102 | // "[SCENE OBJECT GROUP]: Did not update persistence of object {0} since it was still selected by an avatar during the backup sweep", UUID); |
1103 | // } | 1103 | // } |
1104 | } | 1104 | } |
1105 | 1105 | ||
1106 | // Why is storing the inventory outside of HasGroupChanged? | 1106 | // Why is storing the inventory outside of HasGroupChanged? |
1107 | 1107 | ||
1108 | 1108 | ||
1109 | //ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); | 1109 | //ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); |
1110 | } | 1110 | } |
1111 | 1111 | ||
@@ -1192,7 +1192,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1192 | dupe.m_regionHandle = m_regionHandle; | 1192 | dupe.m_regionHandle = m_regionHandle; |
1193 | 1193 | ||
1194 | dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); | 1194 | dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); |
1195 | 1195 | ||
1196 | if (userExposed) | 1196 | if (userExposed) |
1197 | dupe.m_rootPart.TrimPermissions(); | 1197 | dupe.m_rootPart.TrimPermissions(); |
1198 | 1198 | ||
@@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1223 | { | 1223 | { |
1224 | SetRootPartOwner(m_rootPart, cAgentID, cGroupID); | 1224 | SetRootPartOwner(m_rootPart, cAgentID, cGroupID); |
1225 | m_rootPart.ScheduleFullUpdate(); | 1225 | m_rootPart.ScheduleFullUpdate(); |
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.Values); | 1228 | List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.Values); |
1229 | foreach (SceneObjectPart part in partList) | 1229 | foreach (SceneObjectPart part in partList) |
@@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1231 | if (part.UUID != m_rootPart.UUID) | 1231 | if (part.UUID != m_rootPart.UUID) |
1232 | { | 1232 | { |
1233 | dupe.CopyPart(part, OwnerID, GroupID, userExposed); | 1233 | dupe.CopyPart(part, OwnerID, GroupID, userExposed); |
1234 | 1234 | ||
1235 | if (userExposed) | 1235 | if (userExposed) |
1236 | { | 1236 | { |
1237 | SetPartOwner(part, cAgentID, cGroupID); | 1237 | SetPartOwner(part, cAgentID, cGroupID); |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 21e650f..19debea 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1403,10 +1403,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1403 | /// <param name="remoteAvatar"></param> | 1403 | /// <param name="remoteAvatar"></param> |
1404 | public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) | 1404 | public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) |
1405 | { | 1405 | { |
1406 | if(remoteAvatar == null) | 1406 | if (remoteAvatar == null || remoteAvatar.ControllingClient == null) |
1407 | return; | ||
1408 | IClientAPI rc=remoteAvatar.ControllingClient; | ||
1409 | if(rc == null) | ||
1410 | return; | 1407 | return; |
1411 | 1408 | ||
1412 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, | 1409 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, |
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index e66113d..6d88061 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -51,10 +51,10 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
51 | public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) | 51 | public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) |
52 | { | 52 | { |
53 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); | 53 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); |
54 | if ((profile != null) && (profile.RootFolder != null)) | 54 | if ((profile != null) && (profile.RootFolder != null)) |
55 | { | 55 | { |
56 | appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId); | 56 | appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId); |
57 | if (appearance != null) | 57 | if (appearance != null) |
58 | { | 58 | { |
59 | SetAppearanceAssets(profile, ref appearance); | 59 | SetAppearanceAssets(profile, ref appearance); |
60 | m_log.InfoFormat("[APPEARANCE] found : {0}", appearance.ToString()); | 60 | m_log.InfoFormat("[APPEARANCE] found : {0}", appearance.ToString()); |
@@ -182,9 +182,9 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
182 | } | 182 | } |
183 | } | 183 | } |
184 | SetAppearanceAssets(profile, ref avatAppearance); | 184 | SetAppearanceAssets(profile, ref avatAppearance); |
185 | 185 | ||
186 | m_scene.CommsManager.UserService.UpdateUserAppearance(clientView.AgentId, avatAppearance); | 186 | m_scene.CommsManager.UserService.UpdateUserAppearance(clientView.AgentId, avatAppearance); |
187 | avatar.Appearance = avatAppearance; | 187 | avatar.Appearance = avatAppearance; |
188 | } | 188 | } |
189 | else | 189 | else |
190 | { | 190 | { |
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
200 | } | 200 | } |
201 | 201 | ||
202 | public void UpdateDatabase(LLUUID user, AvatarAppearance appearance) | 202 | public void UpdateDatabase(LLUUID user, AvatarAppearance appearance) |
203 | { | 203 | { |
204 | m_scene.CommsManager.UserService.UpdateUserAppearance(user, appearance); | 204 | m_scene.CommsManager.UserService.UpdateUserAppearance(user, appearance); |
205 | } | 205 | } |
206 | 206 | ||
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index fbfb400..9446844 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -3298,8 +3298,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3298 | result.Add(src.Substring(start,length).Trim()); | 3298 | result.Add(src.Substring(start,length).Trim()); |
3299 | start += length+1; | 3299 | start += length+1; |
3300 | length = 0; | 3300 | length = 0; |
3301 | } else | 3301 | } |
3302 | else | ||
3303 | { | ||
3302 | length++; | 3304 | length++; |
3305 | } | ||
3303 | break; | 3306 | break; |
3304 | default : | 3307 | default : |
3305 | length++; | 3308 | length++; |
@@ -5301,7 +5304,8 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5301 | { | 5304 | { |
5302 | // not present at all | 5305 | // not present at all |
5303 | active[j] = false; | 5306 | active[j] = false; |
5304 | } else | 5307 | } |
5308 | else | ||
5305 | { | 5309 | { |
5306 | // present and correct | 5310 | // present and correct |
5307 | if (offset[j] < offset[best]) | 5311 | if (offset[j] < offset[best]) |
@@ -5329,10 +5333,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5329 | 5333 | ||
5330 | tokens.Add(src.Substring(beginning,offset[best]-beginning)); | 5334 | tokens.Add(src.Substring(beginning,offset[best]-beginning)); |
5331 | 5335 | ||
5332 | if (best<seplen) | 5336 | if (best < seplen) |
5333 | { | 5337 | { |
5334 | beginning = offset[best]+((string)separray[best]).Length; | 5338 | beginning = offset[best]+((string)separray[best]).Length; |
5335 | } else | 5339 | } |
5340 | else | ||
5336 | { | 5341 | { |
5337 | beginning = offset[best]+((string)spcarray[best-seplen]).Length; | 5342 | beginning = offset[best]+((string)spcarray[best-seplen]).Length; |
5338 | tokens.Add(spcarray[best-seplen]); | 5343 | tokens.Add(spcarray[best-seplen]); |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index a328a58..bfa9951 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -80,11 +80,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
80 | TaskInventoryItem taskInventoryItem = new TaskInventoryItem(); | 80 | TaskInventoryItem taskInventoryItem = new TaskInventoryItem(); |
81 | if(m_host.TaskInventory.TryGetValue(itemID,out taskInventoryItem)) | 81 | if(m_host.TaskInventory.TryGetValue(itemID,out taskInventoryItem)) |
82 | assetID = taskInventoryItem.AssetID; | 82 | assetID = taskInventoryItem.AssetID; |
83 | 83 | ||
84 | 84 | ||
85 | try | 85 | try |
86 | { | 86 | { |
87 | // Xantor 20080525 see if we already compiled this script this session, stop incessant recompiling on | 87 | // Xantor 20080525 see if we already compiled this script this session, stop incessant recompiling on |
88 | // scriptreset, spawning of objects with embedded scripts etc. | 88 | // scriptreset, spawning of objects with embedded scripts etc. |
89 | 89 | ||
90 | if (scriptList.TryGetValue(assetID, out CompiledScriptFile)) | 90 | if (scriptList.TryGetValue(assetID, out CompiledScriptFile)) |