aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AgentUpdateArgs.cs8
-rw-r--r--OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs3
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Framework/AgentUpdateArgs.cs b/OpenSim/Framework/AgentUpdateArgs.cs
index 7b9ec68..660bc32 100644
--- a/OpenSim/Framework/AgentUpdateArgs.cs
+++ b/OpenSim/Framework/AgentUpdateArgs.cs
@@ -78,5 +78,13 @@ namespace OpenSim.Framework
78 /// </summary> 78 /// </summary>
79 public UUID SessionID; 79 public UUID SessionID;
80 public byte State; 80 public byte State;
81
82 public Vector3 ClientAgentPosition;
83 public bool UseClientAgentPosition;
84
85 public AgentUpdateArgs()
86 {
87 UseClientAgentPosition = false;
88 }
81 } 89 }
82} 90}
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index a1c032e..4eb4bd2 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors
67 IConfig authorizationConfig = source.Configs["AuthorizationService"]; 67 IConfig authorizationConfig = source.Configs["AuthorizationService"];
68 if (authorizationConfig == null) 68 if (authorizationConfig == null)
69 { 69 {
70 m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini"); 70 //m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini");
71 throw new Exception("Authorization connector init error"); 71 throw new Exception("Authorization connector init error");
72 } 72 }
73 73
@@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors
86 bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); 86 bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true);
87 87
88 m_ResponseOnFailure = responseOnFailure; 88 m_ResponseOnFailure = responseOnFailure;
89 m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized");
89 } 90 }
90 91
91 public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID, out string message) 92 public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID, out string message)