diff options
| author | Melanie | 2013-01-02 11:52:37 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-02 11:52:37 +0000 |
| commit | 7943c8d11cbcac3ab16fb347d0c4116adc6437a5 (patch) | |
| tree | a8f099569905001bdedf144a77fd7b9191aa6427 /OpenSim/Region/OptionalModules/Scripting | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: add parameter to have Bullet output performance statistics (diff) | |
| download | opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.zip opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.gz opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.bz2 opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs index 9d373ef..32549d6 100644 --- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs | |||
| @@ -110,12 +110,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule | |||
| 110 | 110 | ||
| 111 | public void ScriptRemoved(UUID itemID) | 111 | public void ScriptRemoved(UUID itemID) |
| 112 | { | 112 | { |
| 113 | System.Console.WriteLine("TEST Script Removed!"); | 113 | // System.Console.WriteLine("TEST Script Removed!"); |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | public void ObjectRemoved(UUID objectID) | 116 | public void ObjectRemoved(UUID objectID) |
| 117 | { | 117 | { |
| 118 | System.Console.WriteLine("TEST Obj Removed!"); | 118 | // System.Console.WriteLine("TEST Obj Removed!"); |
| 119 | } | 119 | } |
| 120 | } | 120 | } |
| 121 | } | 121 | } |