diff options
| author | Justin Clark-Casey (justincc) | 2009-11-26 19:02:41 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-26 19:02:41 +0000 |
| commit | 377bc27c1fdab6f45135194a53ba17cce1f3388f (patch) | |
| tree | 51e2bbc45c30dfceed0311452ad9b30532d7bd13 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Bump trunk version number to 0.6.9. (diff) | |
| parent | Fix a small bug. Trusted script crossings now work again (diff) | |
| download | opensim-SC-377bc27c1fdab6f45135194a53ba17cce1f3388f.zip opensim-SC-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.gz opensim-SC-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.bz2 opensim-SC-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -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 41b5d49..5c5d57e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -1011,10 +1011,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 1011 | { | 1011 | { |
| 1012 | get { return m_RegionID; } | 1012 | get { return m_RegionID; } |
| 1013 | } | 1013 | } |
| 1014 | |||
| 1015 | public bool CanBeDeleted() | ||
| 1016 | { | ||
| 1017 | return true; | ||
| 1018 | } | ||
| 1019 | } | 1014 | } |
| 1020 | } | 1015 | } |