aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/UserConfig.cs7
-rw-r--r--OpenSim/Grid/UserServer/Main.cs5
2 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 3cb0503..c7317ca 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -49,6 +49,8 @@ namespace OpenSim.Framework
49 public bool HttpSSL = DefaultHttpSSL; 49 public bool HttpSSL = DefaultHttpSSL;
50 public string InventoryUrl = String.Empty; 50 public string InventoryUrl = String.Empty;
51 51
52 public bool EnableLLSDLogin = true;
53
52 public UserConfig() 54 public UserConfig()
53 { 55 {
54 // weird, but UserManagerBase needs this. 56 // weird, but UserManagerBase needs this.
@@ -93,6 +95,8 @@ namespace OpenSim.Framework
93 "Known good region X", "1000", false); 95 "Known good region X", "1000", false);
94 configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 96 configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
95 "Known good region Y", "1000", false); 97 "Known good region Y", "1000", false);
98 configMember.addConfigurationOption("enable_llsd_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
99 "Enable LLSD login support? true/false", true.ToString(), false);
96 } 100 }
97 101
98 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 102 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -132,6 +136,9 @@ namespace OpenSim.Framework
132 case "default_Y": 136 case "default_Y":
133 DefaultY = (uint) configuration_result; 137 DefaultY = (uint) configuration_result;
134 break; 138 break;
139 case "enable_llsd_login":
140 EnableLLSDLogin = (bool)configuration_result;
141 break;
135 } 142 }
136 143
137 return true; 144 return true;
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 905bf81..a04b5ef 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -120,7 +120,10 @@ namespace OpenSim.Grid.UserServer
120 120
121 m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin); 121 m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin);
122 122
123 m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod); 123 if (Cfg.EnableLLSDLogin)
124 {
125 m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
126 }
124 127
125 m_httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName); 128 m_httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
126 m_httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID); 129 m_httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID);