diff options
Diffstat (limited to '')
3 files changed, 113 insertions, 106 deletions
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs index 2db718c..f9e118b 100644 --- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs +++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs | |||
@@ -23,104 +23,104 @@ | |||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | 31 | ||
32 | namespace OpenSim.Region.OptionalModules.World.AutoBackup | 32 | namespace OpenSim.Region.OptionalModules.World.AutoBackup |
33 | { | 33 | { |
34 | /// <summary>AutoBackupModuleState: Auto-Backup state for one region (scene). | 34 | /// <summary>AutoBackupModuleState: Auto-Backup state for one region (scene). |
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; |
42 | 42 | ||
43 | public AutoBackupModuleState() | 43 | public AutoBackupModuleState() |
44 | { | 44 | { |
45 | this.Enabled = false; | 45 | this.Enabled = false; |
46 | this.BackupDir = "."; | 46 | this.BackupDir = "."; |
47 | this.BusyCheck = true; | 47 | this.BusyCheck = true; |
48 | this.Timer = null; | 48 | this.Timer = null; |
49 | this.NamingType = NamingType.Time; | 49 | this.NamingType = NamingType.Time; |
50 | this.Script = null; | 50 | this.Script = null; |
51 | } | 51 | } |
52 | 52 | ||
53 | public Dictionary<Guid, string> LiveRequests | 53 | public Dictionary<Guid, string> LiveRequests |
54 | { | 54 | { |
55 | get { | 55 | get { |
56 | return this.m_liveRequests ?? | 56 | return this.m_liveRequests ?? |
57 | (this.m_liveRequests = new Dictionary<Guid, string>(1)); | 57 | (this.m_liveRequests = new Dictionary<Guid, string>(1)); |
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | public bool Enabled | 61 | public bool Enabled |
62 | { | 62 | { |
63 | get; | 63 | get; |
64 | set; | 64 | set; |
65 | } | 65 | } |
66 | 66 | ||
67 | public System.Timers.Timer Timer | 67 | public System.Timers.Timer Timer |
68 | { | 68 | { |
69 | get; | 69 | get; |
70 | set; | 70 | set; |
71 | } | 71 | } |
72 | 72 | ||
73 | public double IntervalMinutes | 73 | public double IntervalMinutes |
74 | { | 74 | { |
75 | get | 75 | get |
76 | { | 76 | { |
77 | if (this.Timer == null) | 77 | if (this.Timer == null) |
78 | { | 78 | { |
79 | return -1.0; | 79 | return -1.0; |
80 | } | 80 | } |
81 | else | 81 | else |
82 | { | 82 | { |
83 | return this.Timer.Interval / 60000.0; | 83 | return this.Timer.Interval / 60000.0; |
84 | } | 84 | } |
85 | } | 85 | } |
86 | } | 86 | } |
87 | 87 | ||
88 | public bool BusyCheck | 88 | public bool BusyCheck |
89 | { | 89 | { |
90 | get; | 90 | get; |
91 | set; | 91 | set; |
92 | } | 92 | } |
93 | 93 | ||
94 | public string Script | 94 | public string Script |
95 | { | 95 | { |
96 | get; | 96 | get; |
97 | set; | 97 | set; |
98 | } | 98 | } |
99 | 99 | ||
100 | public string BackupDir | 100 | public string BackupDir |
101 | { | 101 | { |
102 | get; | 102 | get; |
103 | set; | 103 | set; |
104 | } | 104 | } |
105 | 105 | ||
106 | public NamingType NamingType | 106 | public NamingType NamingType |
107 | { | 107 | { |
108 | get; | 108 | get; |
109 | set; | 109 | set; |
110 | } | 110 | } |
111 | 111 | ||
112 | public new string ToString() | 112 | public new string ToString() |
113 | { | 113 | { |
114 | string retval = ""; | 114 | string retval = ""; |
115 | 115 | ||
116 | retval += "[AUTO BACKUP]: AutoBackup: " + (Enabled ? "ENABLED" : "DISABLED") + "\n"; | 116 | retval += "[AUTO BACKUP]: AutoBackup: " + (Enabled ? "ENABLED" : "DISABLED") + "\n"; |
117 | retval += "[AUTO BACKUP]: Interval: " + IntervalMinutes + " minutes" + "\n"; | 117 | retval += "[AUTO BACKUP]: Interval: " + IntervalMinutes + " minutes" + "\n"; |
118 | retval += "[AUTO BACKUP]: Do Busy Check: " + (BusyCheck ? "Yes" : "No") + "\n"; | 118 | retval += "[AUTO BACKUP]: Do Busy Check: " + (BusyCheck ? "Yes" : "No") + "\n"; |
119 | retval += "[AUTO BACKUP]: Naming Type: " + NamingType.ToString() + "\n"; | 119 | retval += "[AUTO BACKUP]: Naming Type: " + NamingType.ToString() + "\n"; |
120 | retval += "[AUTO BACKUP]: Backup Dir: " + BackupDir + "\n"; | 120 | retval += "[AUTO BACKUP]: Backup Dir: " + BackupDir + "\n"; |
121 | retval += "[AUTO BACKUP]: Script: " + Script + "\n"; | 121 | retval += "[AUTO BACKUP]: Script: " + Script + "\n"; |
122 | return retval; | 122 | return retval; |
123 | } | 123 | } |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 8fc50ff..54d4e92 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -838,6 +838,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
838 | if (module != null) | 838 | if (module != null) |
839 | module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); | 839 | module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); |
840 | } | 840 | } |
841 | |||
842 | public void MoveMoney(UUID fromAgentID, UUID toAgentID, int amount, string text) | ||
843 | { | ||
844 | } | ||
841 | } | 845 | } |
842 | 846 | ||
843 | public enum TransactionType : int | 847 | public enum TransactionType : int |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index ee9a4c1..a29ed21 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
157 | #pragma warning disable 67 | 157 | #pragma warning disable 67 |
158 | public event Action<IClientAPI> OnLogout; | 158 | public event Action<IClientAPI> OnLogout; |
159 | public event ObjectPermissions OnObjectPermissions; | 159 | public event ObjectPermissions OnObjectPermissions; |
160 | 160 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
161 | public event MoneyTransferRequest OnMoneyTransferRequest; | 161 | public event MoneyTransferRequest OnMoneyTransferRequest; |
162 | public event ParcelBuy OnParcelBuy; | 162 | public event ParcelBuy OnParcelBuy; |
163 | public event Action<IClientAPI> OnConnectionClosed; | 163 | public event Action<IClientAPI> OnConnectionClosed; |
@@ -361,7 +361,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
361 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 361 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
362 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 362 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
363 | public event ClassifiedDelete OnClassifiedDelete; | 363 | public event ClassifiedDelete OnClassifiedDelete; |
364 | public event ClassifiedDelete OnClassifiedGodDelete; | 364 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
365 | 365 | ||
366 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 366 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
367 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 367 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -520,7 +520,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
520 | 520 | ||
521 | } | 521 | } |
522 | 522 | ||
523 | public virtual void SendKillObject(ulong regionHandle, uint localID) | 523 | public virtual void SendKillObject(ulong regionHandle, List<uint> localID) |
524 | { | 524 | { |
525 | } | 525 | } |
526 | 526 | ||
@@ -835,8 +835,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
835 | 835 | ||
836 | public void Close() | 836 | public void Close() |
837 | { | 837 | { |
838 | // Remove ourselves from the scene | 838 | Close(true); |
839 | m_scene.RemoveClient(AgentId, false); | 839 | } |
840 | |||
841 | public void Close(bool sendStop) | ||
842 | { | ||
840 | } | 843 | } |
841 | 844 | ||
842 | public void Start() | 845 | public void Start() |