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

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-07-30 21:02:08 +01:00
parent cb23d1bf24 9a4afa753b
commit a63aef978a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -4671,9 +4671,10 @@ namespace OpenSim.Region.Framework.Scenes
ControllingClient.ActiveGroupName = cAgent.ActiveGroupName;
ControllingClient.ActiveGroupPowers = 0;
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);
for(int i = 0 ; i < ngroups; i++)
{