aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
diff options
context:
space:
mode:
authorKitto Flora2010-01-03 23:10:01 -0500
committerKitto Flora2010-01-03 23:10:01 -0500
commit253e2ed699a899b74451ac51ed7875b3f98ffdd7 (patch)
tree8760330fd19b8ae367b79dd63408b33618c4eff2 /OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
parentVehicle Linear parameter adjustments (diff)
parentSolve conflict (diff)
downloadopensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.zip
opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.gz
opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.bz2
opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
index 9d64667..30580e7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
@@ -179,8 +179,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
179 /// </summary> 179 /// </summary>
180 /// <param name="msg">The message to send to the user</param> 180 /// <param name="msg">The message to send to the user</param>
181 void Say(string msg); 181 void Say(string msg);
182 182
183 void Say(string msg,int channel); 183 void Say(string msg,int channel);
184 184
185 //// <value> 185 //// <value>
186 /// Grants access to the objects inventory 186 /// Grants access to the objects inventory