aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie Thielker2019-08-07 18:19:56 +0100
committerMelanie Thielker2019-08-07 18:22:13 +0100
commitc3e74d9e044618b012f38d3d00aeac2dd212bf45 (patch)
treea0cc2d65ae2e099e66b60863d943ab8ec9f7c0ca /OpenSim/Region/ClientStack/Linden
parentMerge branch 'master' of brain.opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-c3e74d9e044618b012f38d3d00aeac2dd212bf45.zip
opensim-SC-c3e74d9e044618b012f38d3d00aeac2dd212bf45.tar.gz
opensim-SC-c3e74d9e044618b012f38d3d00aeac2dd212bf45.tar.bz2
opensim-SC-c3e74d9e044618b012f38d3d00aeac2dd212bf45.tar.xz
Put a scope un users. Should fix Unknown UserUMMAU43 unless the user IS unknown
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rwxr-xr-x[-rw-r--r--]OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index aeb728e..31f08af 100644..100755
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -331,6 +331,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
331 private readonly UUID m_sessionId; 331 private readonly UUID m_sessionId;
332 private readonly UUID m_secureSessionId; 332 private readonly UUID m_secureSessionId;
333 protected readonly UUID m_agentId; 333 protected readonly UUID m_agentId;
334 protected readonly UUID m_scopeId;
334 private readonly uint m_circuitCode; 335 private readonly uint m_circuitCode;
335 private readonly byte[] m_regionChannelVersion = Utils.EmptyBytes; 336 private readonly byte[] m_regionChannelVersion = Utils.EmptyBytes;
336 private readonly IGroupsModule m_GroupsModule; 337 private readonly IGroupsModule m_GroupsModule;
@@ -419,6 +420,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
419 } 420 }
420 } 421 }
421 public UUID AgentId { get { return m_agentId; } } 422 public UUID AgentId { get { return m_agentId; } }
423 public UUID ScopeId { get { return m_scopeId; } }
422 public ISceneAgent SceneAgent { get; set; } 424 public ISceneAgent SceneAgent { get; set; }
423 public UUID ActiveGroupId { get { return m_activeGroupID; } set { m_activeGroupID = value; } } 425 public UUID ActiveGroupId { get { return m_activeGroupID; } set { m_activeGroupID = value; } }
424 public string ActiveGroupName { get { return m_activeGroupName; } set { m_activeGroupName = value; } } 426 public string ActiveGroupName { get { return m_activeGroupName; } set { m_activeGroupName = value; } }
@@ -552,6 +554,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
552 554
553 m_prioritizer = new Prioritizer(m_scene); 555 m_prioritizer = new Prioritizer(m_scene);
554 556
557 // Pick up agent scope which, for gods, can be different from the region scope
558 IUserAccountService userAccountService = m_scene.RequestModuleInterface<IUserAccountService>();
559 var myself = userAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_agentId);
560
555 RegisterLocalPacketHandlers(); 561 RegisterLocalPacketHandlers();
556 string name = string.Format("AsyncInUDP-{0}",m_agentId.ToString()); 562 string name = string.Format("AsyncInUDP-{0}",m_agentId.ToString());
557 m_asyncPacketProcess = new JobEngine(name, name, 10000); 563 m_asyncPacketProcess = new JobEngine(name, name, 10000);