aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-10-31 19:10:33 -0700
committerDiva Canto2009-10-31 19:10:33 -0700
commit58c260140ccd15846700f01cceb7b08d87df144e (patch)
treeaef75122445d29078fdd13768d1a26082d315e47 /OpenSim
parenthttp://opensimulator.org/mantis/view.php?id=4337 (diff)
downloadopensim-SC_OLD-58c260140ccd15846700f01cceb7b08d87df144e.zip
opensim-SC_OLD-58c260140ccd15846700f01cceb7b08d87df144e.tar.gz
opensim-SC_OLD-58c260140ccd15846700f01cceb7b08d87df144e.tar.bz2
opensim-SC_OLD-58c260140ccd15846700f01cceb7b08d87df144e.tar.xz
Patch + minor formatting fixes.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c9221b8..64f7c8d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3817,7 +3817,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3817 { 3817 {
3818 case 1: // DATA_ONLINE (0|1) 3818 case 1: // DATA_ONLINE (0|1)
3819 // TODO: implement fetching of this information 3819 // TODO: implement fetching of this information
3820 if (userProfile.CurrentAgent!=null && userProfile.CurrentAgent.AgentOnline) 3820 if (userProfile.CurrentAgent!=null && userProfile.CurrentAgent.AgentOnline)
3821 reply = "1"; 3821 reply = "1";
3822 else 3822 else
3823 reply = "0"; 3823 reply = "0";
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index 2cb80bd..c2ad9db 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -105,12 +105,12 @@ namespace OpenSim.Services.Connectors
105 catch (Exception e) 105 catch (Exception e)
106 { 106 {
107 m_log.WarnFormat("[AUTHORIZATION CONNECTOR]: Unable to send authorize {0} for region {1} error thrown during comms with remote server. Reason: {2}", userID, regionID, e.Message); 107 m_log.WarnFormat("[AUTHORIZATION CONNECTOR]: Unable to send authorize {0} for region {1} error thrown during comms with remote server. Reason: {2}", userID, regionID, e.Message);
108 message=""; 108 message = "";
109 return m_ResponseOnFailure; 109 return m_ResponseOnFailure;
110 } 110 }
111 if (response==null) 111 if (response == null)
112 { 112 {
113 message = "Null Pointer"; 113 message = "Null response";
114 return m_ResponseOnFailure; 114 return m_ResponseOnFailure;
115 } 115 }
116 m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message); 116 m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message);