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

Merge branch 'master' of opensimulator.org:/var/git/opensim

melanie
Melanie Thielker 2017-01-06 18:14:03 +00:00
parent f2c50db968 fba2466c16
commit 3f3aaef66a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1045,7 +1045,6 @@ namespace OpenSim.Region.Framework.Scenes
public ScenePresence( public ScenePresence(
IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type) IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
{ {
GodController = new GodController(world, this);
m_scene = world; m_scene = world;
AttachmentsSyncLock = new Object(); AttachmentsSyncLock = new Object();
@ -1072,8 +1071,12 @@ namespace OpenSim.Region.Framework.Scenes
else else
m_userFlags = 0; m_userFlags = 0;
int userlevel = 0;
if (account != null) if (account != null)
GodController.UserLevel = account.UserLevel; userlevel = account.UserLevel;
// GodController = new GodController(world, this, userlevel);
GodController = new GodController(world, this);
// IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); // IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
// if (gm != null) // if (gm != null)
@ -4612,6 +4615,7 @@ namespace OpenSim.Region.Framework.Scenes
cAgent.UpAxis = CameraUpAxis; cAgent.UpAxis = CameraUpAxis;
cAgent.Far = DrawDistance; cAgent.Far = DrawDistance;
cAgent.GodData = GodController.State();
// Throttles // Throttles
cAgent.Throttles = ControllingClient.GetThrottlesPacked(1); cAgent.Throttles = ControllingClient.GetThrottlesPacked(1);