diff options
| author | Mic Bowman | 2011-08-26 15:23:46 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-26 15:23:46 -0700 |
| commit | 23f10f1d22d5ecf542119e39503230994c521bf0 (patch) | |
| tree | 2498e8cccf2ed398052dfa53e9a1faf6e998d039 /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar (diff) | |
| download | opensim-SC-23f10f1d22d5ecf542119e39503230994c521bf0.zip opensim-SC-23f10f1d22d5ecf542119e39503230994c521bf0.tar.gz opensim-SC-23f10f1d22d5ecf542119e39503230994c521bf0.tar.bz2 opensim-SC-23f10f1d22d5ecf542119e39503230994c521bf0.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 783791f..ef9b2ac 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -233,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 233 | m_MaxScriptQueue = maxScriptQueue; | 233 | m_MaxScriptQueue = maxScriptQueue; |
| 234 | m_stateSource = stateSource; | 234 | m_stateSource = stateSource; |
| 235 | m_postOnRez = postOnRez; | 235 | m_postOnRez = postOnRez; |
| 236 | m_AttachedAvatar = part.AttachedAvatar; | 236 | m_AttachedAvatar = part.ParentGroup.AttachedAvatar; |
| 237 | m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID; | 237 | m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID; |
| 238 | 238 | ||
| 239 | if (part != null) | 239 | if (part != null) |