aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-06 18:14:03 +0000
committerMelanie Thielker2017-01-06 18:14:03 +0000
commit3f3aaef66aa17d935f71661b28292a3b14de4d1b (patch)
tree8e9caf7af4ecea3a9e6687bcc71848843705bcaa /OpenSim/Region/Framework/Scenes
parentFix an artefact introduced by git's revert merging logic (diff)
parentMerge branch 'master' of opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-3f3aaef66aa17d935f71661b28292a3b14de4d1b.zip
opensim-SC-3f3aaef66aa17d935f71661b28292a3b14de4d1b.tar.gz
opensim-SC-3f3aaef66aa17d935f71661b28292a3b14de4d1b.tar.bz2
opensim-SC-3f3aaef66aa17d935f71661b28292a3b14de4d1b.tar.xz
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 01e0aac..0c88c78 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1045,7 +1045,6 @@ namespace OpenSim.Region.Framework.Scenes
1045 public ScenePresence( 1045 public ScenePresence(
1046 IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type) 1046 IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
1047 { 1047 {
1048 GodController = new GodController(world, this);
1049 1048
1050 m_scene = world; 1049 m_scene = world;
1051 AttachmentsSyncLock = new Object(); 1050 AttachmentsSyncLock = new Object();
@@ -1072,8 +1071,12 @@ namespace OpenSim.Region.Framework.Scenes
1072 else 1071 else
1073 m_userFlags = 0; 1072 m_userFlags = 0;
1074 1073
1074 int userlevel = 0;
1075 if (account != null) 1075 if (account != null)
1076 GodController.UserLevel = account.UserLevel; 1076 userlevel = account.UserLevel;
1077
1078// GodController = new GodController(world, this, userlevel);
1079 GodController = new GodController(world, this);
1077 1080
1078 // IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); 1081 // IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
1079 // if (gm != null) 1082 // if (gm != null)
@@ -4612,6 +4615,7 @@ namespace OpenSim.Region.Framework.Scenes
4612 cAgent.UpAxis = CameraUpAxis; 4615 cAgent.UpAxis = CameraUpAxis;
4613 4616
4614 cAgent.Far = DrawDistance; 4617 cAgent.Far = DrawDistance;
4618 cAgent.GodData = GodController.State();
4615 4619
4616 // Throttles 4620 // Throttles
4617 cAgent.Throttles = ControllingClient.GetThrottlesPacked(1); 4621 cAgent.Throttles = ControllingClient.GetThrottlesPacked(1);