OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix NULL references added in recente changes in standalone mode

LSLKeyTest
UbitUmarov 2016-07-30 20:56:19 +01:00
parent e62f8fd09e
commit 9a4afa753b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
View File

@ -127,6 +127,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
public void PostInitialise() public void PostInitialise()
{ {
if (m_Enabled)
((ISharedRegionModule)m_LocalGridService).PostInitialise(); ((ISharedRegionModule)m_LocalGridService).PostInitialise();
} }
@ -137,13 +138,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
if (m_Enabled) if (m_Enabled)
{
scene.RegisterModuleInterface<IGridService>(this); scene.RegisterModuleInterface<IGridService>(this);
((ISharedRegionModule)m_LocalGridService).AddRegion(scene); ((ISharedRegionModule)m_LocalGridService).AddRegion(scene);
} }
}
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
if (m_Enabled)
((ISharedRegionModule)m_LocalGridService).RemoveRegion(scene); ((ISharedRegionModule)m_LocalGridService).RemoveRegion(scene);
} }

5
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -4671,9 +4671,10 @@ namespace OpenSim.Region.Framework.Scenes
ControllingClient.ActiveGroupName = cAgent.ActiveGroupName; ControllingClient.ActiveGroupName = cAgent.ActiveGroupName;
ControllingClient.ActiveGroupPowers = 0; ControllingClient.ActiveGroupPowers = 0;
Grouptitle = cAgent.ActiveGroupTitle; Grouptitle = cAgent.ActiveGroupTitle;
int ngroups = cAgent.Groups.Length;
if(ngroups > 0) if(cAgent.Groups != null && cAgent.Groups.Length > 0)
{ {
int ngroups = cAgent.Groups.Length;
Dictionary<UUID, ulong> gpowers = new Dictionary<UUID, ulong>(ngroups); Dictionary<UUID, ulong> gpowers = new Dictionary<UUID, ulong>(ngroups);
for(int i = 0 ; i < ngroups; i++) for(int i = 0 ; i < ngroups; i++)
{ {