diff options
| author | Melanie | 2009-11-26 17:27:03 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-26 17:27:03 +0000 |
| commit | 06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6 (patch) | |
| tree | 7c0a0a90235a988d69482a4c93dad6c8bbf6a5fc /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Remove the old remoting-type interregion code for prim/script crossing (diff) | |
| parent | Fix a small bug. Trusted script crossings now work again (diff) | |
| download | opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.zip opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.gz opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.bz2 opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 0f4a9ad..8333a27 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -1018,10 +1018,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 1018 | { | 1018 | { |
| 1019 | get { return m_RegionID; } | 1019 | get { return m_RegionID; } |
| 1020 | } | 1020 | } |
| 1021 | |||
| 1022 | public bool CanBeDeleted() | ||
| 1023 | { | ||
| 1024 | return true; | ||
| 1025 | } | ||
| 1026 | } | 1021 | } |
| 1027 | } | 1022 | } |