diff options
Diffstat (limited to '')
11 files changed, 59 insertions, 59 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs index 1993948..2368a23 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatarAttachment.cs | |||
@@ -33,7 +33,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
33 | /// Describes where on the avatar the attachment is located | 33 | /// Describes where on the avatar the attachment is located |
34 | /// </value> | 34 | /// </value> |
35 | int Location { get ; } | 35 | int Location { get ; } |
36 | 36 | ||
37 | //// <value> | 37 | //// <value> |
38 | /// Accessor to the rez'ed asset, representing the attachment | 38 | /// Accessor to the rez'ed asset, representing the attachment |
39 | /// </value> | 39 | /// </value> |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs index a8e545c..d61f52a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs | |||
@@ -30,7 +30,7 @@ using OpenMetaverse; | |||
30 | using OpenMetaverse.Assets; | 30 | using OpenMetaverse.Assets; |
31 | 31 | ||
32 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 32 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
33 | { | 33 | { |
34 | /// <summary> | 34 | /// <summary> |
35 | /// This implements the methods needed to operate on individual inventory items. | 35 | /// This implements the methods needed to operate on individual inventory items. |
36 | /// </summary> | 36 | /// </summary> |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs index e189489..dc2edd9 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs | |||
@@ -60,19 +60,19 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Returns whether or not this object is still in the world. | 61 | /// Returns whether or not this object is still in the world. |
62 | /// Eg, if you store an IObject reference, however the object | 62 | /// Eg, if you store an IObject reference, however the object |
63 | /// is deleted before you use it, it will throw a NullReference | 63 | /// is deleted before you use it, it will throw a NullReference |
64 | /// exception. 'Exists' allows you to check the object is still | 64 | /// exception. 'Exists' allows you to check the object is still |
65 | /// in play before utilizing it. | 65 | /// in play before utilizing it. |
66 | /// </summary> | 66 | /// </summary> |
67 | /// <example> | 67 | /// <example> |
68 | /// IObject deleteMe = World.Objects[0]; | 68 | /// IObject deleteMe = World.Objects[0]; |
69 | /// | 69 | /// |
70 | /// if (deleteMe.Exists) { | 70 | /// if (deleteMe.Exists) { |
71 | /// deleteMe.Say("Hello, I still exist!"); | 71 | /// deleteMe.Say("Hello, I still exist!"); |
72 | /// } | 72 | /// } |
73 | /// | 73 | /// |
74 | /// World.Objects.Remove(deleteMe); | 74 | /// World.Objects.Remove(deleteMe); |
75 | /// | 75 | /// |
76 | /// if (!deleteMe.Exists) { | 76 | /// if (!deleteMe.Exists) { |
77 | /// Host.Console.Info("I was deleted"); | 77 | /// Host.Console.Info("I was deleted"); |
78 | /// } | 78 | /// } |
@@ -81,7 +81,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
81 | /// Objects should be near-guarunteed to exist for any event which | 81 | /// Objects should be near-guarunteed to exist for any event which |
82 | /// passes them as an argument. Storing an object for a longer period | 82 | /// passes them as an argument. Storing an object for a longer period |
83 | /// of time however will limit their reliability. | 83 | /// of time however will limit their reliability. |
84 | /// | 84 | /// |
85 | /// It is a good practice to use Try/Catch blocks handling for | 85 | /// It is a good practice to use Try/Catch blocks handling for |
86 | /// NullReferenceException, when accessing remote objects. | 86 | /// NullReferenceException, when accessing remote objects. |
87 | /// </remarks> | 87 | /// </remarks> |
@@ -118,8 +118,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
118 | IObject[] Children { get; } | 118 | IObject[] Children { get; } |
119 | 119 | ||
120 | /// <summary> | 120 | /// <summary> |
121 | /// Returns a list of materials attached to this object. Each may contain unique texture | 121 | /// Returns a list of materials attached to this object. Each may contain unique texture |
122 | /// and other visual information. For primitive based objects, this correlates with | 122 | /// and other visual information. For primitive based objects, this correlates with |
123 | /// Object Faces. For mesh based objects, this correlates with Materials. | 123 | /// Object Faces. For mesh based objects, this correlates with Materials. |
124 | /// </summary> | 124 | /// </summary> |
125 | IObjectMaterial[] Materials { get; } | 125 | IObjectMaterial[] Materials { get; } |
@@ -152,7 +152,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
152 | String TouchText { get; set; } | 152 | String TouchText { get; set; } |
153 | 153 | ||
154 | /// <summary> | 154 | /// <summary> |
155 | /// Text to be associated with this object, in the | 155 | /// Text to be associated with this object, in the |
156 | /// Second Life(r) viewer, this is shown above the | 156 | /// Second Life(r) viewer, this is shown above the |
157 | /// object. | 157 | /// object. |
158 | /// </summary> | 158 | /// </summary> |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs index bf85cbc..bec8f38 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
40 | { | 40 | { |
41 | TaskInventoryItem m_privateItem; | 41 | TaskInventoryItem m_privateItem; |
42 | Scene m_rootScene; | 42 | Scene m_rootScene; |
43 | 43 | ||
44 | public InventoryItem(Scene rootScene, TaskInventoryItem internalItem) | 44 | public InventoryItem(Scene rootScene, TaskInventoryItem internalItem) |
45 | { | 45 | { |
46 | m_rootScene = rootScene; | 46 | m_rootScene = rootScene; |
@@ -77,10 +77,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
77 | throw new ApplicationException("[MRM] There is no legal conversion from IInventoryItem to InventoryItem"); | 77 | throw new ApplicationException("[MRM] There is no legal conversion from IInventoryItem to InventoryItem"); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | public int Type { get { return m_privateItem.Type; } } | 81 | public int Type { get { return m_privateItem.Type; } } |
82 | public UUID AssetID { get { return m_privateItem.AssetID; } } | 82 | public UUID AssetID { get { return m_privateItem.AssetID; } } |
83 | 83 | ||
84 | // This method exposes OpenSim/OpenMetaverse internals and needs to be replaced with a IAsset specific to MRM. | 84 | // This method exposes OpenSim/OpenMetaverse internals and needs to be replaced with a IAsset specific to MRM. |
85 | public T RetrieveAsset<T>() where T : OpenMetaverse.Assets.Asset, new() | 85 | public T RetrieveAsset<T>() where T : OpenMetaverse.Assets.Asset, new() |
86 | { | 86 | { |
@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
89 | 89 | ||
90 | if ((sbyte)result.AssetType != a.Type) | 90 | if ((sbyte)result.AssetType != a.Type) |
91 | throw new ApplicationException("[MRM] The supplied asset class does not match the found asset"); | 91 | throw new ApplicationException("[MRM] The supplied asset class does not match the found asset"); |
92 | 92 | ||
93 | result.AssetData = a.Data; | 93 | result.AssetData = a.Data; |
94 | result.Decode(); | 94 | result.Decode(); |
95 | return result; | 95 | return result; |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs index 73fe8b8..5861486 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces; | |||
35 | 35 | ||
36 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 36 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
37 | { | 37 | { |
38 | public class MicroScheduler : System.MarshalByRefObject, IMicrothreader | 38 | public class MicroScheduler : System.MarshalByRefObject, IMicrothreader |
39 | { | 39 | { |
40 | private readonly List<IEnumerator> m_threads = new List<IEnumerator>(); | 40 | private readonly List<IEnumerator> m_threads = new List<IEnumerator>(); |
41 | 41 | ||
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index 47b9c09..5513cd5 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -165,7 +165,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
165 | get { return GetSOP().Description; } | 165 | get { return GetSOP().Description; } |
166 | set | 166 | set |
167 | { | 167 | { |
168 | if (CanEdit()) | 168 | if (CanEdit()) |
169 | GetSOP().Description = value; | 169 | GetSOP().Description = value; |
170 | } | 170 | } |
171 | } | 171 | } |
@@ -192,7 +192,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
192 | rets = new IObject[total]; | 192 | rets = new IObject[total]; |
193 | 193 | ||
194 | int i = 0; | 194 | int i = 0; |
195 | 195 | ||
196 | foreach (SceneObjectPart part in my.ParentGroup.Parts) | 196 | foreach (SceneObjectPart part in my.ParentGroup.Parts) |
197 | { | 197 | { |
198 | rets[i++] = new SOPObject(m_rootScene, part.LocalId, m_security); | 198 | rets[i++] = new SOPObject(m_rootScene, part.LocalId, m_security); |
@@ -273,8 +273,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
273 | public Vector3 SitTarget | 273 | public Vector3 SitTarget |
274 | { | 274 | { |
275 | get { return GetSOP().SitTargetPosition; } | 275 | get { return GetSOP().SitTargetPosition; } |
276 | set | 276 | set |
277 | { | 277 | { |
278 | if (CanEdit()) | 278 | if (CanEdit()) |
279 | { | 279 | { |
280 | GetSOP().SitTargetPosition = value; | 280 | GetSOP().SitTargetPosition = value; |
@@ -285,8 +285,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
285 | public string SitTargetText | 285 | public string SitTargetText |
286 | { | 286 | { |
287 | get { return GetSOP().SitName; } | 287 | get { return GetSOP().SitName; } |
288 | set | 288 | set |
289 | { | 289 | { |
290 | if (CanEdit()) | 290 | if (CanEdit()) |
291 | { | 291 | { |
292 | GetSOP().SitName = value; | 292 | GetSOP().SitName = value; |
@@ -297,7 +297,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
297 | public string TouchText | 297 | public string TouchText |
298 | { | 298 | { |
299 | get { return GetSOP().TouchName; } | 299 | get { return GetSOP().TouchName; } |
300 | set | 300 | set |
301 | { | 301 | { |
302 | if (CanEdit()) | 302 | if (CanEdit()) |
303 | { | 303 | { |
@@ -309,7 +309,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
309 | public string Text | 309 | public string Text |
310 | { | 310 | { |
311 | get { return GetSOP().Text; } | 311 | get { return GetSOP().Text; } |
312 | set | 312 | set |
313 | { | 313 | { |
314 | if (CanEdit()) | 314 | if (CanEdit()) |
315 | { | 315 | { |
@@ -382,11 +382,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
382 | get { return this; } | 382 | get { return this; } |
383 | } | 383 | } |
384 | 384 | ||
385 | public IObjectInventory Inventory | 385 | public IObjectInventory Inventory |
386 | { | 386 | { |
387 | get { return new SOPObjectInventory(m_rootScene, GetSOP().TaskInventory); } | 387 | get { return new SOPObjectInventory(m_rootScene, GetSOP().TaskInventory); } |
388 | } | 388 | } |
389 | 389 | ||
390 | #region Public Functions | 390 | #region Public Functions |
391 | 391 | ||
392 | public void Say(string msg) | 392 | public void Say(string msg) |
@@ -406,7 +406,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
406 | SceneObjectPart sop = GetSOP(); | 406 | SceneObjectPart sop = GetSOP(); |
407 | m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false); | 407 | m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false); |
408 | } | 408 | } |
409 | 409 | ||
410 | public void Dialog(UUID avatar, string message, string[] buttons, int chat_channel) | 410 | public void Dialog(UUID avatar, string message, string[] buttons, int chat_channel) |
411 | { | 411 | { |
412 | if (!CanEdit()) | 412 | if (!CanEdit()) |
@@ -445,9 +445,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
445 | dm.SendDialogToUser( | 445 | dm.SendDialogToUser( |
446 | avatar, GetSOP().Name, GetSOP().UUID, GetSOP().OwnerID, | 446 | avatar, GetSOP().Name, GetSOP().UUID, GetSOP().OwnerID, |
447 | message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buttons); | 447 | message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buttons); |
448 | 448 | ||
449 | } | 449 | } |
450 | 450 | ||
451 | #endregion | 451 | #endregion |
452 | 452 | ||
453 | 453 | ||
@@ -540,7 +540,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
540 | if (hasCut) ret += 2; | 540 | if (hasCut) ret += 2; |
541 | if (hasDimple) ret += 2; | 541 | if (hasDimple) ret += 2; |
542 | if (hasHollow) | 542 | if (hasHollow) |
543 | ret += 1; // GOTCHA: LSL shows 2 additional sides here. | 543 | ret += 1; // GOTCHA: LSL shows 2 additional sides here. |
544 | // This has been fixed, but may cause porting issues. | 544 | // This has been fixed, but may cause porting issues. |
545 | break; | 545 | break; |
546 | case (int) PrimType.Torus: | 546 | case (int) PrimType.Torus: |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectInventory.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectInventory.cs index d20f4a4..8c3158c 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectInventory.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectInventory.cs | |||
@@ -61,25 +61,25 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object | |||
61 | if (!m_publicInventory.ContainsKey(privateItem.ItemID)) | 61 | if (!m_publicInventory.ContainsKey(privateItem.ItemID)) |
62 | m_publicInventory.Add(privateItem.ItemID, new InventoryItem(m_rootScene, privateItem)); | 62 | m_publicInventory.Add(privateItem.ItemID, new InventoryItem(m_rootScene, privateItem)); |
63 | } | 63 | } |
64 | 64 | ||
65 | #region IDictionary<UUID, IInventoryItem> implementation | 65 | #region IDictionary<UUID, IInventoryItem> implementation |
66 | public void Add (UUID key, IInventoryItem value) | 66 | public void Add (UUID key, IInventoryItem value) |
67 | { | 67 | { |
68 | m_publicInventory.Add(key, value); | 68 | m_publicInventory.Add(key, value); |
69 | m_privateInventory.Add(key, InventoryItem.FromInterface(value).ToTaskInventoryItem()); | 69 | m_privateInventory.Add(key, InventoryItem.FromInterface(value).ToTaskInventoryItem()); |
70 | } | 70 | } |
71 | 71 | ||
72 | public bool ContainsKey (UUID key) | 72 | public bool ContainsKey (UUID key) |
73 | { | 73 | { |
74 | return m_privateInventory.ContainsKey(key); | 74 | return m_privateInventory.ContainsKey(key); |
75 | } | 75 | } |
76 | 76 | ||
77 | public bool Remove (UUID key) | 77 | public bool Remove (UUID key) |
78 | { | 78 | { |
79 | m_publicInventory.Remove(key); | 79 | m_publicInventory.Remove(key); |
80 | return m_privateInventory.Remove(key); | 80 | return m_privateInventory.Remove(key); |
81 | } | 81 | } |
82 | 82 | ||
83 | public bool TryGetValue (UUID key, out IInventoryItem value) | 83 | public bool TryGetValue (UUID key, out IInventoryItem value) |
84 | { | 84 | { |
85 | value = null; | 85 | value = null; |
@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object | |||
89 | { | 89 | { |
90 | // wasn't found in the public inventory | 90 | // wasn't found in the public inventory |
91 | TaskInventoryItem privateItem; | 91 | TaskInventoryItem privateItem; |
92 | 92 | ||
93 | result = m_privateInventory.TryGetValue(key, out privateItem); | 93 | result = m_privateInventory.TryGetValue(key, out privateItem); |
94 | if (result) | 94 | if (result) |
95 | { | 95 | { |
@@ -98,16 +98,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object | |||
98 | } | 98 | } |
99 | } else | 99 | } else |
100 | return true; | 100 | return true; |
101 | 101 | ||
102 | return result; | 102 | return result; |
103 | } | 103 | } |
104 | 104 | ||
105 | public ICollection<UUID> Keys { | 105 | public ICollection<UUID> Keys { |
106 | get { | 106 | get { |
107 | return m_privateInventory.Keys; | 107 | return m_privateInventory.Keys; |
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
111 | public ICollection<IInventoryItem> Values { | 111 | public ICollection<IInventoryItem> Values { |
112 | get { | 112 | get { |
113 | SynchronizeDictionaries(); | 113 | SynchronizeDictionaries(); |
@@ -139,41 +139,41 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object | |||
139 | { | 139 | { |
140 | Add(item.Key, item.Value); | 140 | Add(item.Key, item.Value); |
141 | } | 141 | } |
142 | 142 | ||
143 | public void Clear () | 143 | public void Clear () |
144 | { | 144 | { |
145 | m_publicInventory.Clear(); | 145 | m_publicInventory.Clear(); |
146 | m_privateInventory.Clear(); | 146 | m_privateInventory.Clear(); |
147 | } | 147 | } |
148 | 148 | ||
149 | public bool Contains (KeyValuePair<UUID, IInventoryItem> item) | 149 | public bool Contains (KeyValuePair<UUID, IInventoryItem> item) |
150 | { | 150 | { |
151 | return m_privateInventory.ContainsKey(item.Key); | 151 | return m_privateInventory.ContainsKey(item.Key); |
152 | } | 152 | } |
153 | 153 | ||
154 | public void CopyTo (KeyValuePair<UUID, IInventoryItem>[] array, int arrayIndex) | 154 | public void CopyTo (KeyValuePair<UUID, IInventoryItem>[] array, int arrayIndex) |
155 | { | 155 | { |
156 | throw new NotImplementedException(); | 156 | throw new NotImplementedException(); |
157 | } | 157 | } |
158 | 158 | ||
159 | public bool Remove (KeyValuePair<UUID, IInventoryItem> item) | 159 | public bool Remove (KeyValuePair<UUID, IInventoryItem> item) |
160 | { | 160 | { |
161 | return Remove(item.Key); | 161 | return Remove(item.Key); |
162 | } | 162 | } |
163 | 163 | ||
164 | public int Count { | 164 | public int Count { |
165 | get { | 165 | get { |
166 | return m_privateInventory.Count; | 166 | return m_privateInventory.Count; |
167 | } | 167 | } |
168 | } | 168 | } |
169 | 169 | ||
170 | public bool IsReadOnly { | 170 | public bool IsReadOnly { |
171 | get { | 171 | get { |
172 | return false; | 172 | return false; |
173 | } | 173 | } |
174 | } | 174 | } |
175 | #endregion | 175 | #endregion |
176 | 176 | ||
177 | #region Explicit implementations | 177 | #region Explicit implementations |
178 | IInventoryItem System.Collections.Generic.IDictionary<UUID, IInventoryItem>.this[UUID key] | 178 | IInventoryItem System.Collections.Generic.IDictionary<UUID, IInventoryItem>.this[UUID key] |
179 | { | 179 | { |
@@ -189,13 +189,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object | |||
189 | m_privateInventory[key] = InventoryItem.FromInterface(value).ToTaskInventoryItem(); | 189 | m_privateInventory[key] = InventoryItem.FromInterface(value).ToTaskInventoryItem(); |
190 | } | 190 | } |
191 | } | 191 | } |
192 | 192 | ||
193 | void System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<UUID, IInventoryItem>>.CopyTo(System.Collections.Generic.KeyValuePair<UUID,IInventoryItem>[] array, int offset) | 193 | void System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<UUID, IInventoryItem>>.CopyTo(System.Collections.Generic.KeyValuePair<UUID,IInventoryItem>[] array, int offset) |
194 | { | 194 | { |
195 | throw new NotImplementedException(); | 195 | throw new NotImplementedException(); |
196 | } | 196 | } |
197 | #endregion | 197 | #endregion |
198 | 198 | ||
199 | public IInventoryItem this[string name] | 199 | public IInventoryItem this[string name] |
200 | { | 200 | { |
201 | get { | 201 | get { |
@@ -204,7 +204,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object | |||
204 | { | 204 | { |
205 | if (!m_publicInventory.ContainsKey(i.ItemID)) | 205 | if (!m_publicInventory.ContainsKey(i.ItemID)) |
206 | m_publicInventory.Add(i.ItemID, new InventoryItem(m_rootScene, i)); | 206 | m_publicInventory.Add(i.ItemID, new InventoryItem(m_rootScene, i)); |
207 | 207 | ||
208 | return m_publicInventory[i.ItemID]; | 208 | return m_publicInventory[i.ItemID]; |
209 | } | 209 | } |
210 | throw new KeyNotFoundException(); | 210 | throw new KeyNotFoundException(); |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs index d192309..a380f66 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs | |||
@@ -70,18 +70,18 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
70 | get { return GetSP().AbsolutePosition; } | 70 | get { return GetSP().AbsolutePosition; } |
71 | set { GetSP().Teleport(value); } | 71 | set { GetSP().Teleport(value); } |
72 | } | 72 | } |
73 | 73 | ||
74 | public bool IsChildAgent | 74 | public bool IsChildAgent |
75 | { | 75 | { |
76 | get { return GetSP().IsChildAgent; } | 76 | get { return GetSP().IsChildAgent; } |
77 | } | 77 | } |
78 | 78 | ||
79 | #region IAvatar implementation | 79 | #region IAvatar implementation |
80 | public IAvatarAttachment[] Attachments | 80 | public IAvatarAttachment[] Attachments |
81 | { | 81 | { |
82 | get { | 82 | get { |
83 | List<IAvatarAttachment> attachments = new List<IAvatarAttachment>(); | 83 | List<IAvatarAttachment> attachments = new List<IAvatarAttachment>(); |
84 | 84 | ||
85 | List<AvatarAttachment> internalAttachments = GetSP().Appearance.GetAttachments(); | 85 | List<AvatarAttachment> internalAttachments = GetSP().Appearance.GetAttachments(); |
86 | foreach (AvatarAttachment attach in internalAttachments) | 86 | foreach (AvatarAttachment attach in internalAttachments) |
87 | { | 87 | { |
@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
89 | new UUID(attach.ItemID), | 89 | new UUID(attach.ItemID), |
90 | new UUID(attach.AssetID), m_security)); | 90 | new UUID(attach.AssetID), m_security)); |
91 | } | 91 | } |
92 | 92 | ||
93 | return attachments.ToArray(); | 93 | return attachments.ToArray(); |
94 | } | 94 | } |
95 | } | 95 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs index 570459a..bcf6053 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
41 | private readonly UUID m_assetId; | 41 | private readonly UUID m_assetId; |
42 | 42 | ||
43 | private readonly ISecurityCredential m_security; | 43 | private readonly ISecurityCredential m_security; |
44 | 44 | ||
45 | public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId, ISecurityCredential security) | 45 | public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId, ISecurityCredential security) |
46 | { | 46 | { |
47 | m_rootScene = rootScene; | 47 | m_rootScene = rootScene; |
@@ -51,9 +51,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
51 | //m_itemId = itemId; | 51 | //m_itemId = itemId; |
52 | m_assetId = assetId; | 52 | m_assetId = assetId; |
53 | } | 53 | } |
54 | 54 | ||
55 | public int Location { get { return m_location; } } | 55 | public int Location { get { return m_location; } } |
56 | 56 | ||
57 | public IObject Asset | 57 | public IObject Asset |
58 | { | 58 | { |
59 | get | 59 | get |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs index 13d0140..724c2a9 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim | |||
51 | 51 | ||
52 | public void Microthread(IEnumerable thread) | 52 | public void Microthread(IEnumerable thread) |
53 | { | 53 | { |
54 | 54 | ||
55 | } | 55 | } |
56 | 56 | ||
57 | public void RunMicrothread() | 57 | public void RunMicrothread() |
@@ -92,7 +92,7 @@ namespace OpenSim | |||
92 | 92 | ||
93 | public override void Stop() | 93 | public override void Stop() |
94 | { | 94 | { |
95 | 95 | ||
96 | } | 96 | } |
97 | } | 97 | } |
98 | } | 98 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs index f2324d2..36f70d0 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs | |||
@@ -34,7 +34,7 @@ using OpenSim.Region.OptionalModules.Scripting.Minimodule.WorldX; | |||
34 | 34 | ||
35 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 35 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
36 | { | 36 | { |
37 | public class World : System.MarshalByRefObject, IWorld, IWorldAudio | 37 | public class World : System.MarshalByRefObject, IWorld, IWorldAudio |
38 | { | 38 | { |
39 | private readonly Scene m_internalScene; | 39 | private readonly Scene m_internalScene; |
40 | private readonly ISecurityCredential m_security; | 40 | private readonly ISecurityCredential m_security; |
@@ -149,7 +149,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
149 | e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security); | 149 | e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security); |
150 | e.Text = chat.Message; | 150 | e.Text = chat.Message; |
151 | e.Channel = chat.Channel; | 151 | e.Channel = chat.Channel; |
152 | 152 | ||
153 | _OnChat(this, e); | 153 | _OnChat(this, e); |
154 | return; | 154 | return; |
155 | } | 155 | } |
@@ -160,7 +160,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
160 | e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security); | 160 | e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security); |
161 | e.Text = chat.Message; | 161 | e.Text = chat.Message; |
162 | e.Channel = chat.Channel; | 162 | e.Channel = chat.Channel; |
163 | 163 | ||
164 | _OnChat(this, e); | 164 | _OnChat(this, e); |
165 | return; | 165 | return; |
166 | } | 166 | } |