diff options
Diffstat (limited to 'OpenSim/Framework')
4 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs index 4853c3a..a1afe8d 100644 --- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs +++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs | |||
@@ -34,6 +34,6 @@ namespace OpenSim.Framework.Communications | |||
34 | { | 34 | { |
35 | bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); | 35 | bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); |
36 | bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); | 36 | bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); |
37 | bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID); | 37 | bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId); |
38 | } | 38 | } |
39 | } | 39 | } |
diff --git a/OpenSim/Framework/General/ClientManager.cs b/OpenSim/Framework/General/ClientManager.cs index b032849..7cf0aea 100644 --- a/OpenSim/Framework/General/ClientManager.cs +++ b/OpenSim/Framework/General/ClientManager.cs | |||
@@ -100,5 +100,10 @@ namespace OpenSim.Framework | |||
100 | } | 100 | } |
101 | } | 101 | } |
102 | } | 102 | } |
103 | |||
104 | public bool TryGetClient(uint circuitId, out IClientAPI user) | ||
105 | { | ||
106 | return m_clients.TryGetValue(circuitId, out user); | ||
107 | } | ||
103 | } | 108 | } |
104 | } | 109 | } |
diff --git a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs index e4c13ba..e421ba5 100644 --- a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs +++ b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs | |||
@@ -116,7 +116,6 @@ namespace OpenSim.Framework.Configuration | |||
116 | configurationPlugin.LoadData(); | 116 | configurationPlugin.LoadData(); |
117 | useFile = true; | 117 | useFile = true; |
118 | } | 118 | } |
119 | |||
120 | else | 119 | else |
121 | { | 120 | { |
122 | MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file."); | 121 | MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file."); |
diff --git a/OpenSim/Framework/General/Interfaces/IScene.cs b/OpenSim/Framework/General/Interfaces/IScene.cs index 6140918..e3e65f1 100644 --- a/OpenSim/Framework/General/Interfaces/IScene.cs +++ b/OpenSim/Framework/General/Interfaces/IScene.cs | |||
@@ -38,5 +38,10 @@ namespace OpenSim.Framework.Interfaces | |||
38 | RegionInfo RegionInfo { get; } | 38 | RegionInfo RegionInfo { get; } |
39 | object SyncRoot { get; } | 39 | object SyncRoot { get; } |
40 | uint NextLocalId { get; } | 40 | uint NextLocalId { get; } |
41 | |||
42 | ClientManager ClientManager | ||
43 | { | ||
44 | get; | ||
45 | } | ||
41 | } | 46 | } |
42 | } | 47 | } |