diff options
| author | Diva Canto | 2012-03-13 20:16:19 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-13 20:16:19 -0700 |
| commit | d6dd3c42d1ad91b4fca409abdc1d817f4a1468af (patch) | |
| tree | a97c2cb780e8a2e8ff7c0f1421d22e02f207ffa9 /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Teleports: bounce off repeated requests of teleporting the same agent. Some s... (diff) | |
| parent | refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ... (diff) | |
| download | opensim-SC-d6dd3c42d1ad91b4fca409abdc1d817f4a1468af.zip opensim-SC-d6dd3c42d1ad91b4fca409abdc1d817f4a1468af.tar.gz opensim-SC-d6dd3c42d1ad91b4fca409abdc1d817f4a1468af.tar.bz2 opensim-SC-d6dd3c42d1ad91b4fca409abdc1d817f4a1468af.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 66349e3..ab41873 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -990,7 +990,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 990 | lock (m_Scripts) | 990 | lock (m_Scripts) |
| 991 | { | 991 | { |
| 992 | // Create the object record | 992 | // Create the object record |
| 993 | |||
| 994 | if ((!m_Scripts.ContainsKey(itemID)) || | 993 | if ((!m_Scripts.ContainsKey(itemID)) || |
| 995 | (m_Scripts[itemID].AssetID != assetID)) | 994 | (m_Scripts[itemID].AssetID != assetID)) |
| 996 | { | 995 | { |