diff options
| author | Melanie Thielker | 2010-05-31 01:02:04 +0200 |
|---|---|---|
| committer | Melanie | 2010-05-30 23:57:13 +0100 |
| commit | 8df9f272eb0bd25c8965453ef8a88e3c998eeec8 (patch) | |
| tree | 5690462960d2040d3c4b578c857ee3b8ae9eec78 | |
| parent | Changes osFunction permissions again. Allow_ with a list of UUIDs now again (diff) | |
| download | opensim-SC_OLD-8df9f272eb0bd25c8965453ef8a88e3c998eeec8.zip opensim-SC_OLD-8df9f272eb0bd25c8965453ef8a88e3c998eeec8.tar.gz opensim-SC_OLD-8df9f272eb0bd25c8965453ef8a88e3c998eeec8.tar.bz2 opensim-SC_OLD-8df9f272eb0bd25c8965453ef8a88e3c998eeec8.tar.xz | |
Fix a nullref in EventManager caused by RegionReady not setting the scene
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index c653e98..672109b 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
| @@ -146,6 +146,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
| 146 | c.Position = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30); | 146 | c.Position = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30); |
| 147 | c.Sender = null; | 147 | c.Sender = null; |
| 148 | c.SenderUUID = UUID.Zero; | 148 | c.SenderUUID = UUID.Zero; |
| 149 | c.Scene = m_scene; | ||
| 149 | 150 | ||
| 150 | m_log.InfoFormat("[RegionReady]: Region \"{0}\" is ready: \"{1}\" on channel {2}", | 151 | m_log.InfoFormat("[RegionReady]: Region \"{0}\" is ready: \"{1}\" on channel {2}", |
| 151 | m_scene.RegionInfo.RegionName, c.Message, m_channelNotify); | 152 | m_scene.RegionInfo.RegionName, c.Message, m_channelNotify); |