diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 28 |
1 files changed, 14 insertions, 14 deletions
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: |