aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-02-19 22:44:33 +0000
committerJustin Clark-Casey (justincc)2010-02-19 22:44:33 +0000
commit68b494b2cc54cfdd8fa8a0736332046de3887d6f (patch)
tree2c9ab8b763ccbba91f031f7a61ba4f94f2d1294d
parentminor: remove mono compiler warning (diff)
downloadopensim-SC_OLD-68b494b2cc54cfdd8fa8a0736332046de3887d6f.zip
opensim-SC_OLD-68b494b2cc54cfdd8fa8a0736332046de3887d6f.tar.gz
opensim-SC_OLD-68b494b2cc54cfdd8fa8a0736332046de3887d6f.tar.bz2
opensim-SC_OLD-68b494b2cc54cfdd8fa8a0736332046de3887d6f.tar.xz
Apply http://opensimulator.org/mantis/view.php?id=4495
Adds IsChildAgent property to IAvatar in MRM. Thanks ziah
Diffstat (limited to '')
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs5
3 files changed, 9 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 13c05ef..5b4959a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -128,6 +128,7 @@ what it is today.
128* YZh 128* YZh
129* Zackary Geers aka Kunnis Basiat 129* Zackary Geers aka Kunnis Basiat
130* Zha Ewry 130* Zha Ewry
131* ziah
131 132
132 133
133= LSL Devs = 134= LSL Devs =
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
index 03c1e95..3d49732 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IAvatar.cs
@@ -34,6 +34,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
34{ 34{
35 public interface IAvatar : IEntity 35 public interface IAvatar : IEntity
36 { 36 {
37
38 bool IsChildAgent { get; }
39
37 //// <value> 40 //// <value>
38 /// Array of worn attachments, empty but not null, if no attachments are worn 41 /// Array of worn attachments, empty but not null, if no attachments are worn
39 /// </value> 42 /// </value>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index 4427426..0786bd9 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -70,6 +70,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
70 set { GetSP().TeleportWithMomentum(value); } 70 set { GetSP().TeleportWithMomentum(value); }
71 } 71 }
72 72
73 public bool IsChildAgent
74 {
75 get { return GetSP().IsChildAgent; }
76 }
77
73 #region IAvatar implementation 78 #region IAvatar implementation
74 public IAvatarAttachment[] Attachments 79 public IAvatarAttachment[] Attachments
75 { 80 {