aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-08-13 13:41:54 +0000
committerMW2007-08-13 13:41:54 +0000
commit7fbc3266dfb5e923fb240fe81591fc96691a06b9 (patch)
tree0cd541a17e71343cc95fc9342d928c9402c60186
parentSome work to prepare for inventory server. (diff)
downloadopensim-SC_OLD-7fbc3266dfb5e923fb240fe81591fc96691a06b9.zip
opensim-SC_OLD-7fbc3266dfb5e923fb240fe81591fc96691a06b9.tar.gz
opensim-SC_OLD-7fbc3266dfb5e923fb240fe81591fc96691a06b9.tar.bz2
opensim-SC_OLD-7fbc3266dfb5e923fb240fe81591fc96691a06b9.tar.xz
The Welcome message /message of the day shown in the client during login, can now be set from the .INI file for standalone mode (change the standalone_welcome = "Welcome to OpenSim" line).
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs25
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
-rw-r--r--bin/OpenSim.ini1
5 files changed, 25 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6c49817..ca95a8d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -72,6 +72,8 @@ namespace OpenSim
72 private string m_logFilename = ("region-console.log"); 72 private string m_logFilename = ("region-console.log");
73 73
74 private bool standaloneAuthenticate = false; 74 private bool standaloneAuthenticate = false;
75 private string welcomeMessage = null;
76
75 public ConsoleCommand CreateAccount = null; 77 public ConsoleCommand CreateAccount = null;
76 78
77 public OpenSimMain(IConfigSource configSource) 79 public OpenSimMain(IConfigSource configSource)
@@ -104,6 +106,7 @@ namespace OpenSim
104 m_storageDLL = configSource.Configs["Startup"].GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 106 m_storageDLL = configSource.Configs["Startup"].GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
105 107
106 standaloneAuthenticate = configSource.Configs["Startup"].GetBoolean("standalone_authenticate", false); 108 standaloneAuthenticate = configSource.Configs["Startup"].GetBoolean("standalone_authenticate", false);
109 welcomeMessage = configSource.Configs["Startup"].GetString("standalone_welcome", "Welcome to OpenSim");
107 } 110 }
108 111
109 /// <summary> 112 /// <summary>
@@ -123,7 +126,7 @@ namespace OpenSim
123 126
124 if (m_sandbox) 127 if (m_sandbox)
125 { 128 {
126 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate); 129 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate, welcomeMessage);
127 m_commsManager = localComms; 130 m_commsManager = localComms;
128 if(standaloneAuthenticate) 131 if(standaloneAuthenticate)
129 { 132 {
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 5b66816..a0bbf6d 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -40,10 +40,10 @@ namespace OpenSim.Region.Communications.Local
40 public LocalBackEndServices SandBoxServices = new LocalBackEndServices(); 40 public LocalBackEndServices SandBoxServices = new LocalBackEndServices();
41 public LocalUserServices UserServices; 41 public LocalUserServices UserServices;
42 42
43 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate ) 43 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate, string welcomeMessage )
44 : base(serversInfo, httpServer, assetCache) 44 : base(serversInfo, httpServer, assetCache)
45 { 45 {
46 UserServices = new LocalUserServices(this, serversInfo, accountsAuthenticate); 46 UserServices = new LocalUserServices(this, serversInfo, accountsAuthenticate, welcomeMessage);
47 UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll"); 47 UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
48 UserServer = UserServices; 48 UserServer = UserServices;
49 GridServer = SandBoxServices; 49 GridServer = SandBoxServices;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 223c157..63f8c21 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -16,14 +16,19 @@ namespace OpenSim.Region.Communications.Local
16 private uint defaultHomeX ; 16 private uint defaultHomeX ;
17 private uint defaultHomeY; 17 private uint defaultHomeY;
18 private bool authUsers = false; 18 private bool authUsers = false;
19 private string welcomeMessage = "Welcome to OpenSim";
19 20
20 public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo, bool authenticate) 21 public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo, bool authenticate, string welcomeMess)
21 { 22 {
22 m_Parent = parent; 23 m_Parent = parent;
23 this.serversInfo = serversInfo; 24 this.serversInfo = serversInfo;
24 defaultHomeX = this.serversInfo.DefaultHomeLocX; 25 defaultHomeX = this.serversInfo.DefaultHomeLocX;
25 defaultHomeY = this.serversInfo.DefaultHomeLocY; 26 defaultHomeY = this.serversInfo.DefaultHomeLocY;
26 this.authUsers = authenticate; 27 this.authUsers = authenticate;
28 if (welcomeMess != "")
29 {
30 this.welcomeMessage = welcomeMess;
31 }
27 } 32 }
28 33
29 public UserProfileData GetUserProfile(string firstName, string lastName) 34 public UserProfileData GetUserProfile(string firstName, string lastName)
@@ -47,7 +52,7 @@ namespace OpenSim.Region.Communications.Local
47 /// <returns></returns> 52 /// <returns></returns>
48 public override string GetMessage() 53 public override string GetMessage()
49 { 54 {
50 return "Welcome to OpenSim"; 55 return welcomeMessage;
51 } 56 }
52 57
53 public override UserProfileData GetTheUser(string firstname, string lastname) 58 public override UserProfileData GetTheUser(string firstname, string lastname)
@@ -59,13 +64,17 @@ namespace OpenSim.Region.Communications.Local
59 return profile; 64 return profile;
60 } 65 }
61 66
62 //no current user account so make one 67 if (!authUsers)
63 Console.WriteLine("No User account found so creating a new one "); 68 {
64 this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY); 69 //no current user account so make one
65 70 Console.WriteLine("No User account found so creating a new one ");
66 profile = getUserProfile(firstname, lastname); 71 this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
72
73 profile = getUserProfile(firstname, lastname);
67 74
68 return profile; 75 return profile;
76 }
77 return null;
69 } 78 }
70 79
71 public override bool AuthenticateUser(UserProfileData profile, string password) 80 public override bool AuthenticateUser(UserProfileData profile, string password)
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 8db3262..0763b83 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -47,7 +47,7 @@ namespace SimpleApp
47 { 47 {
48 base.StartUp(); 48 base.StartUp();
49 49
50 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, false); 50 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, false, "");
51 51
52 m_log.Notice(m_log.LineInfo); 52 m_log.Notice(m_log.LineInfo);
53 53
diff --git a/bin/OpenSim.ini b/bin/OpenSim.ini
index 278202d..c2cbdec 100644
--- a/bin/OpenSim.ini
+++ b/bin/OpenSim.ini
@@ -3,3 +3,4 @@ gridmode = false
3physics = basicphysics 3physics = basicphysics
4storage_plugin = "OpenSim.DataStore.NullStorage.dll" 4storage_plugin = "OpenSim.DataStore.NullStorage.dll"
5standalone_authenticate = false 5standalone_authenticate = false
6standalone_welcome = "Welcome to OpenSim" \ No newline at end of file