aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDouglas R. Miles2009-10-31 19:24:14 -0800
committerDiva Canto2009-10-31 19:05:02 -0700
commit7f4d646aeacef5e82a4f8df1494e3752afc3372f (patch)
tree13d879bcd1dc86590f07ef0598075ef937f8f1bb /OpenSim
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-7f4d646aeacef5e82a4f8df1494e3752afc3372f.zip
opensim-SC_OLD-7f4d646aeacef5e82a4f8df1494e3752afc3372f.tar.gz
opensim-SC_OLD-7f4d646aeacef5e82a4f8df1494e3752afc3372f.tar.bz2
opensim-SC_OLD-7f4d646aeacef5e82a4f8df1494e3752afc3372f.tar.xz
http://opensimulator.org/mantis/view.php?id=4337
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, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 3849558..c9221b8 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.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 7926efb..2cb80bd 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -108,7 +108,11 @@ namespace OpenSim.Services.Connectors
108 message=""; 108 message="";
109 return m_ResponseOnFailure; 109 return m_ResponseOnFailure;
110 } 110 }
111 111 if (response==null)
112 {
113 message = "Null Pointer";
114 return m_ResponseOnFailure;
115 }
112 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);
113 message = response.Message; 117 message = response.Message;
114 118