aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs20
-rw-r--r--OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs60
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs32
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs32
-rw-r--r--OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs18
7 files changed, 84 insertions, 84 deletions
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
index ceb3332..79b80f8 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
@@ -63,28 +63,28 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
63 /// If specified in Regions.ini, the settings should be within the region's section name. 63 /// If specified in Regions.ini, the settings should be within the region's section name.
64 /// If specified in OpenSim.ini, the settings should be within the [AutoBackupModule] section. 64 /// If specified in OpenSim.ini, the settings should be within the [AutoBackupModule] section.
65 /// Region-specific settings take precedence. 65 /// Region-specific settings take precedence.
66 /// 66 ///
67 /// AutoBackupModuleEnabled: True/False. Default: False. If True, use the auto backup module. This setting does not support per-region basis. 67 /// AutoBackupModuleEnabled: True/False. Default: False. If True, use the auto backup module. This setting does not support per-region basis.
68 /// All other settings under [AutoBackupModule] are ignored if AutoBackupModuleEnabled is false, even per-region settings! 68 /// All other settings under [AutoBackupModule] are ignored if AutoBackupModuleEnabled is false, even per-region settings!
69 /// AutoBackup: True/False. Default: False. If True, activate auto backup functionality. 69 /// AutoBackup: True/False. Default: False. If True, activate auto backup functionality.
70 /// This is the only required option for enabling auto-backup; the other options have sane defaults. 70 /// This is the only required option for enabling auto-backup; the other options have sane defaults.
71 /// If False for a particular region, the auto-backup module becomes a no-op for the region, and all other AutoBackup* settings are ignored. 71 /// If False for a particular region, the auto-backup module becomes a no-op for the region, and all other AutoBackup* settings are ignored.
72 /// If False globally (the default), only regions that specifically override it in Regions.ini will get AutoBackup functionality. 72 /// If False globally (the default), only regions that specifically override it in Regions.ini will get AutoBackup functionality.
73 /// AutoBackupInterval: Double, non-negative value. Default: 720 (12 hours). 73 /// AutoBackupInterval: Double, non-negative value. Default: 720 (12 hours).
74 /// The number of minutes between each backup attempt. 74 /// The number of minutes between each backup attempt.
75 /// If a negative or zero value is given, it is equivalent to setting AutoBackup = False. 75 /// If a negative or zero value is given, it is equivalent to setting AutoBackup = False.
76 /// AutoBackupBusyCheck: True/False. Default: True. 76 /// AutoBackupBusyCheck: True/False. Default: True.
77 /// If True, we will only take an auto-backup if a set of conditions are met. 77 /// If True, we will only take an auto-backup if a set of conditions are met.
78 /// These conditions are heuristics to try and avoid taking a backup when the sim is busy. 78 /// These conditions are heuristics to try and avoid taking a backup when the sim is busy.
79 /// AutoBackupSkipAssets 79 /// AutoBackupSkipAssets
80 /// If true, assets are not saved to the oar file. Considerably reduces impact on simulator when backing up. Intended for when assets db is backed up separately 80 /// If true, assets are not saved to the oar file. Considerably reduces impact on simulator when backing up. Intended for when assets db is backed up separately
81 /// AutoBackupKeepFilesForDays 81 /// AutoBackupKeepFilesForDays
82 /// Backup files older than this value (in days) are deleted during the current backup process, 0 will disable this and keep all backup files indefinitely 82 /// Backup files older than this value (in days) are deleted during the current backup process, 0 will disable this and keep all backup files indefinitely
83 /// AutoBackupScript: String. Default: not specified (disabled). 83 /// AutoBackupScript: String. Default: not specified (disabled).
84 /// File path to an executable script or binary to run when an automatic backup is taken. 84 /// File path to an executable script or binary to run when an automatic backup is taken.
85 /// The file should really be (Windows) an .exe or .bat, or (Linux/Mac) a shell script or binary. 85 /// The file should really be (Windows) an .exe or .bat, or (Linux/Mac) a shell script or binary.
86 /// Trying to "run" directories, or things with weird file associations on Win32, might cause unexpected results! 86 /// Trying to "run" directories, or things with weird file associations on Win32, might cause unexpected results!
87 /// argv[1] of the executed file/script will be the file name of the generated OAR. 87 /// argv[1] of the executed file/script will be the file name of the generated OAR.
88 /// If the process can't be spawned for some reason (file not found, no execute permission, etc), write a warning to the console. 88 /// If the process can't be spawned for some reason (file not found, no execute permission, etc), write a warning to the console.
89 /// AutoBackupNaming: string. Default: Time. 89 /// AutoBackupNaming: string. Default: Time.
90 /// One of three strings (case insensitive): 90 /// One of three strings (case insensitive):
@@ -295,7 +295,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
295 if (args.Length != 2) { 295 if (args.Length != 2) {
296 MainConsole.Instance.OutputFormat ("Usage: dobackup <regionname>"); 296 MainConsole.Instance.OutputFormat ("Usage: dobackup <regionname>");
297 return; 297 return;
298 } 298 }
299 bool found = false; 299 bool found = false;
300 string name = args [1]; 300 string name = args [1];
301 lock (m_Scenes) { 301 lock (m_Scenes) {
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
index ce7c368..b90f0c4 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
35 /// If you use this class in any way outside of AutoBackupModule, you should treat the class as opaque. 35 /// If you use this class in any way outside of AutoBackupModule, you should treat the class as opaque.
36 /// Since it is not part of the framework, you really should not rely upon it outside of the AutoBackupModule implementation. 36 /// Since it is not part of the framework, you really should not rely upon it outside of the AutoBackupModule implementation.
37 /// </summary> 37 /// </summary>
38 /// 38 ///
39 public class AutoBackupModuleState 39 public class AutoBackupModuleState
40 { 40 {
41 private Dictionary<Guid, string> m_liveRequests = null; 41 private Dictionary<Guid, string> m_liveRequests = null;
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 8565f5a..47edeb9 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -151,13 +151,13 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
151 // to the command line parameters you use to start up your client 151 // to the command line parameters you use to start up your client
152 // This commonly looks like -helperuri http://127.0.0.1:9000/ 152 // This commonly looks like -helperuri http://127.0.0.1:9000/
153 153
154 154
155 // Local Server.. enables functionality only. 155 // Local Server.. enables functionality only.
156 httpServer.AddXmlRPCHandler("getCurrencyQuote", quote_func); 156 httpServer.AddXmlRPCHandler("getCurrencyQuote", quote_func);
157 httpServer.AddXmlRPCHandler("buyCurrency", buy_func); 157 httpServer.AddXmlRPCHandler("buyCurrency", buy_func);
158 httpServer.AddXmlRPCHandler("preflightBuyLandPrep", preflightBuyLandPrep_func); 158 httpServer.AddXmlRPCHandler("preflightBuyLandPrep", preflightBuyLandPrep_func);
159 httpServer.AddXmlRPCHandler("buyLandPrep", landBuy_func); 159 httpServer.AddXmlRPCHandler("buyLandPrep", landBuy_func);
160 160
161 } 161 }
162 162
163 if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle)) 163 if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle))
@@ -212,7 +212,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
212 212
213 bool give_result = doMoneyTransfer(fromID, toID, amount, 2, description); 213 bool give_result = doMoneyTransfer(fromID, toID, amount, 2, description);
214 214
215 215
216 BalanceUpdate(fromID, toID, give_result, description); 216 BalanceUpdate(fromID, toID, give_result, description);
217 217
218 return give_result; 218 return give_result;
@@ -303,7 +303,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
303 private bool doMoneyTransfer(UUID Sender, UUID Receiver, int amount, int transactiontype, string description) 303 private bool doMoneyTransfer(UUID Sender, UUID Receiver, int amount, int transactiontype, string description)
304 { 304 {
305 bool result = true; 305 bool result = true;
306 306
307 return result; 307 return result;
308 } 308 }
309 309
@@ -377,10 +377,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
377 else 377 else
378 { 378 {
379 m_log.ErrorFormat( 379 m_log.ErrorFormat(
380 "[MONEY]: Could not resolve user {0}", 380 "[MONEY]: Could not resolve user {0}",
381 agentID); 381 agentID);
382 } 382 }
383 383
384 return String.Empty; 384 return String.Empty;
385 } 385 }
386 386
@@ -464,7 +464,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
464 Hashtable quoteResponse = new Hashtable(); 464 Hashtable quoteResponse = new Hashtable();
465 XmlRpcResponse returnval = new XmlRpcResponse(); 465 XmlRpcResponse returnval = new XmlRpcResponse();
466 466
467 467
468 Hashtable currencyResponse = new Hashtable(); 468 Hashtable currencyResponse = new Hashtable();
469 currencyResponse.Add("estimatedCost", 0); 469 currencyResponse.Add("estimatedCost", 0);
470 currencyResponse.Add("currencyBuy", amount); 470 currencyResponse.Add("currencyBuy", amount);
@@ -475,7 +475,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
475 475
476 returnval.Value = quoteResponse; 476 returnval.Value = quoteResponse;
477 return returnval; 477 return returnval;
478 478
479 479
480 480
481 } 481 }
@@ -485,7 +485,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
485 // Hashtable requestData = (Hashtable) request.Params[0]; 485 // Hashtable requestData = (Hashtable) request.Params[0];
486 // UUID agentId = UUID.Zero; 486 // UUID agentId = UUID.Zero;
487 // int amount = 0; 487 // int amount = 0;
488 488
489 XmlRpcResponse returnval = new XmlRpcResponse(); 489 XmlRpcResponse returnval = new XmlRpcResponse();
490 Hashtable returnresp = new Hashtable(); 490 Hashtable returnresp = new Hashtable();
491 returnresp.Add("success", true); 491 returnresp.Add("success", true);
@@ -536,7 +536,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
536 536
537 // UUID agentId = UUID.Zero; 537 // UUID agentId = UUID.Zero;
538 // int amount = 0; 538 // int amount = 0;
539 539
540 retparam.Add("success", true); 540 retparam.Add("success", true);
541 ret.Value = retparam; 541 ret.Value = retparam;
542 542
@@ -553,7 +553,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
553 /// <param name="agentID"></param> 553 /// <param name="agentID"></param>
554 private void CheckExistAndRefreshFunds(UUID agentID) 554 private void CheckExistAndRefreshFunds(UUID agentID)
555 { 555 {
556 556
557 } 557 }
558 558
559 /// <summary> 559 /// <summary>
@@ -564,13 +564,13 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
564 private int GetFundsForAgentID(UUID AgentID) 564 private int GetFundsForAgentID(UUID AgentID)
565 { 565 {
566 int returnfunds = 0; 566 int returnfunds = 0;
567 567
568 return returnfunds; 568 return returnfunds;
569 } 569 }
570 570
571 // private void SetLocalFundsForAgentID(UUID AgentID, int amount) 571 // private void SetLocalFundsForAgentID(UUID AgentID, int amount)
572 // { 572 // {
573 573
574 // } 574 // }
575 575
576 #endregion 576 #endregion
@@ -689,7 +689,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
689 /// <see cref="OpenSim.Region.Framework.Scenes.EventManager.ClientClosed"/> 689 /// <see cref="OpenSim.Region.Framework.Scenes.EventManager.ClientClosed"/>
690 public void ClientClosed(UUID AgentID, Scene scene) 690 public void ClientClosed(UUID AgentID, Scene scene)
691 { 691 {
692 692
693 } 693 }
694 694
695 /// <summary> 695 /// <summary>
@@ -708,19 +708,19 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
708 708
709 private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e) 709 private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e)
710 { 710 {
711 711
712 712
713 lock (e) 713 lock (e)
714 { 714 {
715 e.economyValidated = true; 715 e.economyValidated = true;
716 } 716 }
717 717
718 718
719 } 719 }
720 720
721 private void processLandBuy(Object osender, EventManager.LandBuyArgs e) 721 private void processLandBuy(Object osender, EventManager.LandBuyArgs e)
722 { 722 {
723 723
724 } 724 }
725 725
726 /// <summary> 726 /// <summary>
@@ -730,7 +730,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
730 /// <param name="e"></param> 730 /// <param name="e"></param>
731 private void MoneyTransferAction(Object osender, EventManager.MoneyTransferArgs e) 731 private void MoneyTransferAction(Object osender, EventManager.MoneyTransferArgs e)
732 { 732 {
733 733
734 } 734 }
735 735
736 /// <summary> 736 /// <summary>
@@ -739,7 +739,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
739 /// <param name="avatar"></param> 739 /// <param name="avatar"></param>
740 private void MakeChildAgent(ScenePresence avatar) 740 private void MakeChildAgent(ScenePresence avatar)
741 { 741 {
742 742
743 } 743 }
744 744
745 /// <summary> 745 /// <summary>
@@ -748,7 +748,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
748 /// <param name="AgentId"></param> 748 /// <param name="AgentId"></param>
749 private void ClientLoggedOut(UUID AgentId, Scene scene) 749 private void ClientLoggedOut(UUID AgentId, Scene scene)
750 { 750 {
751 751
752 } 752 }
753 753
754 /// <summary> 754 /// <summary>
@@ -768,7 +768,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
768 /// <param name="regionID"></param> 768 /// <param name="regionID"></param>
769 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) 769 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
770 { 770 {
771 771
772 //m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString()); 772 //m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString());
773 } 773 }
774 774
@@ -809,12 +809,12 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
809 809
810 Scene s = LocateSceneClientIn(remoteClient.AgentId); 810 Scene s = LocateSceneClientIn(remoteClient.AgentId);
811 811
812 // Implmenting base sale data checking here so the default OpenSimulator implementation isn't useless 812 // Implmenting base sale data checking here so the default OpenSimulator implementation isn't useless
813 // combined with other implementations. We're actually validating that the client is sending the data 813 // combined with other implementations. We're actually validating that the client is sending the data
814 // that it should. In theory, the client should already know what to send here because it'll see it when it 814 // that it should. In theory, the client should already know what to send here because it'll see it when it
815 // gets the object data. If the data sent by the client doesn't match the object, the viewer probably has an 815 // gets the object data. If the data sent by the client doesn't match the object, the viewer probably has an
816 // old idea of what the object properties are. Viewer developer Hazim informed us that the base module 816 // old idea of what the object properties are. Viewer developer Hazim informed us that the base module
817 // didn't check the client sent data against the object do any. Since the base modules are the 817 // didn't check the client sent data against the object do any. Since the base modules are the
818 // 'crowning glory' examples of good practice.. 818 // 'crowning glory' examples of good practice..
819 819
820 // Validate that the object exists in the scene the user is in 820 // Validate that the object exists in the scene the user is in
@@ -824,15 +824,15 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
824 remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false); 824 remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false);
825 return; 825 return;
826 } 826 }
827 827
828 // Validate that the client sent the price that the object is being sold for 828 // Validate that the client sent the price that the object is being sold for
829 if (part.SalePrice != salePrice) 829 if (part.SalePrice != salePrice)
830 { 830 {
831 remoteClient.SendAgentAlertMessage("Cannot buy at this price. Buy Failed. If you continue to get this relog.", false); 831 remoteClient.SendAgentAlertMessage("Cannot buy at this price. Buy Failed. If you continue to get this relog.", false);
832 return; 832 return;
833 } 833 }
834 834
835 // Validate that the client sent the proper sale type the object has set 835 // Validate that the client sent the proper sale type the object has set
836 if (part.ObjectSaleType != saleType) 836 if (part.ObjectSaleType != saleType)
837 { 837 {
838 remoteClient.SendAgentAlertMessage("Cannot buy this way. Buy Failed. If you continue to get this relog.", false); 838 remoteClient.SendAgentAlertMessage("Cannot buy this way. Buy Failed. If you continue to get this relog.", false);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 0cabe47..6a7c735 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
49 } 49 }
50 50
51 public delegate void ChatToNPC( 51 public delegate void ChatToNPC(
52 string message, byte type, Vector3 fromPos, string fromName, 52 string message, byte type, Vector3 fromPos, string fromName,
53 UUID fromAgentID, UUID ownerID, byte source, byte audible); 53 UUID fromAgentID, UUID ownerID, byte source, byte audible);
54 54
55 /// <summary> 55 /// <summary>
@@ -223,7 +223,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
223 { 223 {
224 224
225 } 225 }
226 226
227 public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, 227 public void SendSitResponse(UUID TargetID, Vector3 OffsetPos,
228 Quaternion SitOrientation, bool autopilot, 228 Quaternion SitOrientation, bool autopilot,
229 Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) 229 Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
@@ -519,7 +519,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
519 public event AvatarInterestUpdate OnAvatarInterestUpdate; 519 public event AvatarInterestUpdate OnAvatarInterestUpdate;
520 520
521 public event PlacesQuery OnPlacesQuery; 521 public event PlacesQuery OnPlacesQuery;
522 522
523 public event FindAgentUpdate OnFindAgent; 523 public event FindAgentUpdate OnFindAgent;
524 public event TrackAgentUpdate OnTrackAgent; 524 public event TrackAgentUpdate OnTrackAgent;
525 public event NewUserReport OnUserReport; 525 public event NewUserReport OnUserReport;
@@ -931,7 +931,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
931 OnRegionHandShakeReply(this); 931 OnRegionHandShakeReply(this);
932 } 932 }
933 } 933 }
934 934
935 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) 935 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
936 { 936 {
937 } 937 }
@@ -951,7 +951,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
951 public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) 951 public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
952 { 952 {
953 } 953 }
954 954
955 public void SendImageNotFound(UUID imageid) 955 public void SendImageNotFound(UUID imageid)
956 { 956 {
957 } 957 }
@@ -959,7 +959,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
959 public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData) 959 public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
960 { 960 {
961 } 961 }
962 962
963 public void SendShutdownConnectionNotice() 963 public void SendShutdownConnectionNotice()
964 { 964 {
965 } 965 }
@@ -970,7 +970,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
970 970
971 public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags) 971 public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags)
972 { 972 {
973 973
974 } 974 }
975 975
976 public void SendObjectPropertiesReply(ISceneEntity entity) 976 public void SendObjectPropertiesReply(ISceneEntity entity)
@@ -984,7 +984,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
984 public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks) 984 public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
985 { 985 {
986 } 986 }
987 987
988 public void SendViewerTime(int phase) 988 public void SendViewerTime(int phase)
989 { 989 {
990 } 990 }
@@ -1029,7 +1029,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1029 // We never start the client, so always fail. 1029 // We never start the client, so always fail.
1030 throw new NotImplementedException(); 1030 throw new NotImplementedException();
1031 } 1031 }
1032 1032
1033 public void Stop() 1033 public void Stop()
1034 { 1034 {
1035 } 1035 }
@@ -1224,11 +1224,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1224 public void SendJoinGroupReply(UUID groupID, bool success) 1224 public void SendJoinGroupReply(UUID groupID, bool success)
1225 { 1225 {
1226 } 1226 }
1227 1227
1228 public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success) 1228 public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success)
1229 { 1229 {
1230 } 1230 }
1231 1231
1232 public void SendLeaveGroupReply(UUID groupID, bool success) 1232 public void SendLeaveGroupReply(UUID groupID, bool success)
1233 { 1233 {
1234 } 1234 }
@@ -1318,7 +1318,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1318 { 1318 {
1319 } 1319 }
1320 #endregion 1320 #endregion
1321 1321
1322 public void SendRebakeAvatarTextures(UUID textureID) 1322 public void SendRebakeAvatarTextures(UUID textureID)
1323 { 1323 {
1324 } 1324 }
@@ -1326,15 +1326,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1326 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) 1326 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1327 { 1327 {
1328 } 1328 }
1329 1329
1330 public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt) 1330 public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
1331 { 1331 {
1332 } 1332 }
1333 1333
1334 public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier) 1334 public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
1335 { 1335 {
1336 } 1336 }
1337 1337
1338 public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) 1338 public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
1339 { 1339 {
1340 } 1340 }
@@ -1354,7 +1354,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1354 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId) 1354 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
1355 { 1355 {
1356 } 1356 }
1357 1357
1358 public void SendAgentTerseUpdate(ISceneEntity presence) 1358 public void SendAgentTerseUpdate(ISceneEntity presence)
1359 { 1359 {
1360 } 1360 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index a892cf4..9a1ea73 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -209,10 +209,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
209 UserAccountHelpers.CreateUserWithInventory(m_scene, userId); 209 UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
210 ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId); 210 ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
211 211
212 InventoryItemBase att1Item 212 InventoryItemBase att1Item
213 = UserInventoryHelpers.CreateInventoryItem( 213 = UserInventoryHelpers.CreateInventoryItem(
214 m_scene, "att1", TestHelpers.ParseTail(0x2), TestHelpers.ParseTail(0x3), sp.UUID, InventoryType.Object); 214 m_scene, "att1", TestHelpers.ParseTail(0x2), TestHelpers.ParseTail(0x3), sp.UUID, InventoryType.Object);
215 InventoryItemBase att2Item 215 InventoryItemBase att2Item
216 = UserInventoryHelpers.CreateInventoryItem( 216 = UserInventoryHelpers.CreateInventoryItem(
217 m_scene, "att2", TestHelpers.ParseTail(0x12), TestHelpers.ParseTail(0x13), sp.UUID, InventoryType.Object); 217 m_scene, "att2", TestHelpers.ParseTail(0x12), TestHelpers.ParseTail(0x13), sp.UUID, InventoryType.Object);
218 218
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index bea3a1e..d0d726c 100644
--- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
@@ -54,38 +54,38 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
54 private Scene m_scene; 54 private Scene m_scene;
55 55
56 public string Name { get { return "Scene Commands Module"; } } 56 public string Name { get { return "Scene Commands Module"; } }
57 57
58 public Type ReplaceableInterface { get { return null; } } 58 public Type ReplaceableInterface { get { return null; } }
59 59
60 public void Initialise(IConfigSource source) 60 public void Initialise(IConfigSource source)
61 { 61 {
62// m_log.DebugFormat("[SCENE COMMANDS MODULE]: INITIALIZED MODULE"); 62// m_log.DebugFormat("[SCENE COMMANDS MODULE]: INITIALIZED MODULE");
63 } 63 }
64 64
65 public void PostInitialise() 65 public void PostInitialise()
66 { 66 {
67// m_log.DebugFormat("[SCENE COMMANDS MODULE]: POST INITIALIZED MODULE"); 67// m_log.DebugFormat("[SCENE COMMANDS MODULE]: POST INITIALIZED MODULE");
68 } 68 }
69 69
70 public void Close() 70 public void Close()
71 { 71 {
72// m_log.DebugFormat("[SCENE COMMANDS MODULE]: CLOSED MODULE"); 72// m_log.DebugFormat("[SCENE COMMANDS MODULE]: CLOSED MODULE");
73 } 73 }
74 74
75 public void AddRegion(Scene scene) 75 public void AddRegion(Scene scene)
76 { 76 {
77// m_log.DebugFormat("[SCENE COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); 77// m_log.DebugFormat("[SCENE COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
78 78
79 m_scene = scene; 79 m_scene = scene;
80 80
81 m_scene.RegisterModuleInterface<ISceneCommandsModule>(this); 81 m_scene.RegisterModuleInterface<ISceneCommandsModule>(this);
82 } 82 }
83 83
84 public void RemoveRegion(Scene scene) 84 public void RemoveRegion(Scene scene)
85 { 85 {
86// m_log.DebugFormat("[SCENE COMMANDS MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); 86// m_log.DebugFormat("[SCENE COMMANDS MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
87 } 87 }
88 88
89 public void RegionLoaded(Scene scene) 89 public void RegionLoaded(Scene scene)
90 { 90 {
91// m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); 91// m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
@@ -101,7 +101,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
101 + "client-rot-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" 101 + "client-rot-upd - the tolerance before clients are updated with new rotation information for an avatar.\n"
102 + "client-vel-upd - the tolerance before clients are updated with new velocity information for an avatar.\n" 102 + "client-vel-upd - the tolerance before clients are updated with new velocity information for an avatar.\n"
103 + "root-upd-per - if greater than 1, terse updates are only sent to root agents other than the originator on every n updates.\n" 103 + "root-upd-per - if greater than 1, terse updates are only sent to root agents other than the originator on every n updates.\n"
104 + "child-upd-per - if greater than 1, terse updates are only sent to child agents on every n updates.\n" 104 + "child-upd-per - if greater than 1, terse updates are only sent to child agents on every n updates.\n"
105 + "collisions - if false then collisions with other objects are turned off.\n" 105 + "collisions - if false then collisions with other objects are turned off.\n"
106 + "pbackup - if false then periodic scene backup is turned off.\n" 106 + "pbackup - if false then periodic scene backup is turned off.\n"
107 + "physics - if false then all physics objects are non-physical.\n" 107 + "physics - if false then all physics objects are non-physical.\n"
@@ -213,7 +213,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
213 213
214 // FIXME: This can only come from the console at the moment but might not always be true. 214 // FIXME: This can only come from the console at the moment but might not always be true.
215 if (ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, options["appear-refresh"], out newValue)) 215 if (ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, options["appear-refresh"], out newValue))
216 m_scene.SendPeriodicAppearanceUpdates = newValue; 216 m_scene.SendPeriodicAppearanceUpdates = newValue;
217 } 217 }
218 218
219 if (options.ContainsKey("client-pos-upd")) 219 if (options.ContainsKey("client-pos-upd"))
@@ -222,7 +222,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
222 222
223 // FIXME: This can only come from the console at the moment but might not always be true. 223 // FIXME: This can only come from the console at the moment but might not always be true.
224 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue)) 224 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue))
225 m_scene.RootPositionUpdateTolerance = newValue; 225 m_scene.RootPositionUpdateTolerance = newValue;
226 } 226 }
227 227
228 if (options.ContainsKey("client-rot-upd")) 228 if (options.ContainsKey("client-rot-upd"))
@@ -231,7 +231,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
231 231
232 // FIXME: This can only come from the console at the moment but might not always be true. 232 // FIXME: This can only come from the console at the moment but might not always be true.
233 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue)) 233 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue))
234 m_scene.RootRotationUpdateTolerance = newValue; 234 m_scene.RootRotationUpdateTolerance = newValue;
235 } 235 }
236 236
237 if (options.ContainsKey("client-vel-upd")) 237 if (options.ContainsKey("client-vel-upd"))
@@ -240,7 +240,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
240 240
241 // FIXME: This can only come from the console at the moment but might not always be true. 241 // FIXME: This can only come from the console at the moment but might not always be true.
242 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue)) 242 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue))
243 m_scene.RootVelocityUpdateTolerance = newValue; 243 m_scene.RootVelocityUpdateTolerance = newValue;
244 } 244 }
245 245
246 if (options.ContainsKey("root-upd-per")) 246 if (options.ContainsKey("root-upd-per"))
@@ -249,7 +249,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
249 249
250 // FIXME: This can only come from the console at the moment but might not always be true. 250 // FIXME: This can only come from the console at the moment but might not always be true.
251 if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["root-upd-per"], out newValue)) 251 if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["root-upd-per"], out newValue))
252 m_scene.RootTerseUpdatePeriod = newValue; 252 m_scene.RootTerseUpdatePeriod = newValue;
253 } 253 }
254 254
255 if (options.ContainsKey("child-upd-per")) 255 if (options.ContainsKey("child-upd-per"))
@@ -258,7 +258,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
258 258
259 // FIXME: This can only come from the console at the moment but might not always be true. 259 // FIXME: This can only come from the console at the moment but might not always be true.
260 if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["child-upd-per"], out newValue)) 260 if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["child-upd-per"], out newValue))
261 m_scene.ChildTerseUpdatePeriod = newValue; 261 m_scene.ChildTerseUpdatePeriod = newValue;
262 } 262 }
263 263
264 if (options.ContainsKey("pbackup")) 264 if (options.ContainsKey("pbackup"))
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index e4a3382..e22c6ea 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -45,7 +45,7 @@ using System.IO;
45namespace OpenSim.Region.OptionalModules.World.TreePopulator 45namespace OpenSim.Region.OptionalModules.World.TreePopulator
46{ 46{
47 /// <summary> 47 /// <summary>
48 /// Version 2.02 - Still hacky 48 /// Version 2.02 - Still hacky
49 /// </summary> 49 /// </summary>
50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "TreePopulatorModule")] 50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "TreePopulatorModule")]
51 public class TreePopulatorModule : INonSharedRegionModule, ICommandableModule, IVegetationModule 51 public class TreePopulatorModule : INonSharedRegionModule, ICommandableModule, IVegetationModule
@@ -60,7 +60,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
60 public string m_name; 60 public string m_name;
61 public Boolean m_frozen; 61 public Boolean m_frozen;
62 public Tree m_tree_type; 62 public Tree m_tree_type;
63 public int m_tree_quantity; 63 public int m_tree_quantity;
64 public float m_treeline_low; 64 public float m_treeline_low;
65 public float m_treeline_high; 65 public float m_treeline_high;
66 public Vector3 m_seed_point; 66 public Vector3 m_seed_point;
@@ -78,7 +78,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
78 { 78 {
79 } 79 }
80 80
81 public Copse(string fileName, Boolean planted) 81 public Copse(string fileName, Boolean planted)
82 { 82 {
83 Copse cp = (Copse)DeserializeObject(fileName); 83 Copse cp = (Copse)DeserializeObject(fileName);
84 84
@@ -139,7 +139,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
139 { 139 {
140 string frozen = (this.m_frozen ? "F" : "A"); 140 string frozen = (this.m_frozen ? "F" : "A");
141 141
142 return string.Format("{0}TPM: {1}; {2}; {3:0.0}; {4:0.0}; {5:0.0}; {6}; {7:0.0}; {8:0.0}; {9:0.0}; {10:0.00};", 142 return string.Format("{0}TPM: {1}; {2}; {3:0.0}; {4:0.0}; {5:0.0}; {6}; {7:0.0}; {8:0.0}; {9:0.0}; {10:0.00};",
143 frozen, 143 frozen,
144 this.m_name, 144 this.m_name,
145 this.m_tree_quantity, 145 this.m_tree_quantity,
@@ -156,7 +156,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
156 156
157 private List<Copse> m_copse; 157 private List<Copse> m_copse;
158 158
159 private double m_update_ms = 1000.0; // msec between updates 159 private double m_update_ms = 1000.0; // msec between updates
160 private bool m_active_trees = false; 160 private bool m_active_trees = false;
161 161
162 Timer CalculateTrees; 162 Timer CalculateTrees;
@@ -174,7 +174,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
174 174
175 public void Initialise(IConfigSource config) 175 public void Initialise(IConfigSource config)
176 { 176 {
177 177
178 // ini file settings 178 // ini file settings
179 try 179 try
180 { 180 {
@@ -621,11 +621,11 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
621 CalculateTrees.Elapsed += CalculateTrees_Elapsed; 621 CalculateTrees.Elapsed += CalculateTrees_Elapsed;
622 CalculateTrees.Start(); 622 CalculateTrees.Start();
623 } 623 }
624 else 624 else
625 { 625 {
626 CalculateTrees.Stop(); 626 CalculateTrees.Stop();
627 } 627 }
628 } 628 }
629 629
630 private void growTrees() 630 private void growTrees()
631 { 631 {
@@ -670,7 +670,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
670 if (copse.m_trees.Count < copse.m_tree_quantity) 670 if (copse.m_trees.Count < copse.m_tree_quantity)
671 { 671 {
672 // Tree has grown enough to seed if it has grown by at least 25% of seeded to full grown height 672 // Tree has grown enough to seed if it has grown by at least 25% of seeded to full grown height
673 if (s_tree.Scale.Z > copse.m_initial_scale.Z + (copse.m_maximum_scale.Z - copse.m_initial_scale.Z) / 4.0) 673 if (s_tree.Scale.Z > copse.m_initial_scale.Z + (copse.m_maximum_scale.Z - copse.m_initial_scale.Z) / 4.0)
674 { 674 {
675 if (Util.RandomClass.NextDouble() > 0.75) 675 if (Util.RandomClass.NextDouble() > 0.75)
676 { 676 {