From 5dcb14726da1ae60d1f740708e568194056cee04 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 14 Jan 2010 02:42:15 +0000 Subject: [PATCH 1/4] Make the auth module silent when there is no configuration for it --- .../Connectors/Authorization/AuthorizationServiceConnector.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs index a1c032ec64..4eb4bd2470 100644 --- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs @@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors IConfig authorizationConfig = source.Configs["AuthorizationService"]; if (authorizationConfig == null) { - m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini"); + //m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini"); throw new Exception("Authorization connector init error"); } @@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); m_ResponseOnFailure = responseOnFailure; + m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized"); } public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID, out string message) From 88d2adc93cd91baa9b2c9899ebe727672c914ec3 Mon Sep 17 00:00:00 2001 From: dahlia Date: Thu, 14 Jan 2010 02:16:40 -0800 Subject: [PATCH 2/4] add an agent position field to AgentUpdateArgs for use by some non-LL clients --- OpenSim/Framework/AgentUpdateArgs.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OpenSim/Framework/AgentUpdateArgs.cs b/OpenSim/Framework/AgentUpdateArgs.cs index 7b9ec68966..660bc327de 100644 --- a/OpenSim/Framework/AgentUpdateArgs.cs +++ b/OpenSim/Framework/AgentUpdateArgs.cs @@ -78,5 +78,13 @@ namespace OpenSim.Framework /// public UUID SessionID; public byte State; + + public Vector3 ClientAgentPosition; + public bool UseClientAgentPosition; + + public AgentUpdateArgs() + { + UseClientAgentPosition = false; + } } } From 7e07bca21232c7f027b8e1acf876badbfbd2a66a Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 15 Jan 2010 17:24:24 +0000 Subject: [PATCH 3/4] * Separate out building instructions. Further revise README --- BUILDING.txt | 30 ++++++++++++++++++++++++++++++ README.txt | 52 +++++++++++++++++++++++++++------------------------- 2 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 BUILDING.txt diff --git a/BUILDING.txt b/BUILDING.txt new file mode 100644 index 0000000000..03fb482226 --- /dev/null +++ b/BUILDING.txt @@ -0,0 +1,30 @@ +== Building OpenSim == + +=== Building on Windows === + +Steps: + * runprebuild.bat + * Load OpenSim.sln into Visual Studio .NET and build the solution. + * chdir bin + * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include + * run OpenSim.exe + +=== Building on Linux === + +Prereqs: + * Mono >= 2.4.2 + * Nant >= 0.85 + * On some Linux distributions you may need to install additional packages. + See http://opensimulator.org/wiki/Dependencies for more information. + +From the distribution type: + * ./runprebuild.sh + * nant + * cd bin + * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include + * run mono OpenSim.exe + +=== References === + +Helpful resources: +* http://opensimulator.org/wiki/Build_Instructions diff --git a/README.txt b/README.txt index 339d6872c1..2aa59ac3ac 100644 --- a/README.txt +++ b/README.txt @@ -10,41 +10,38 @@ C#, and can run under Mono or the Microsoft .NET runtimes. This is considered an alpha release. Some stuff works, a lot doesn't. If it breaks, you get to keep *both* pieces. -== Installation on Windows == +== Compiling OpenSim == -Prereqs: - * runprebuild.bat - * Load OpenSim.sln into Visual Studio .NET and build the solution. - * chdir bin - * edit OpenSim.ini and appropriate files in bin/config-include - * OpenSim.exe - - Helpful resources: -* http://opensimulator.org/wiki/Build_Instructions +Please see BUILDING.txt if you downloaded a source distribution and +need to build OpenSim before running it. -See configuring OpenSim +== Running OpenSim on Windows == -== Installation on Linux == +We recommend that you run OpenSim from a command prompt on Windows in order +to capture any errors, though you can also run it by double-clicking +bin/OpenSim.exe -Prereqs: - * Mono >= 2.4.2 - * Nant >= 0.86 beta 1 (if building with the .NET framework on Windows), 0.85 (if building with the mono framework) - * sqlite3 or mysql 5.x (you'll need a backend database) +To run OpenSim from a command prompt + + * cd to the bin/ directory where you unpacked OpenSim + * run OpenSim.exe + +Now see the "Configuring OpenSim" section + +== Running OpenSim on Linux == + +You will need Mono >= 2.4.2 to run OpenSim. On some Linux distributions you +may need to install additional packages. See http://opensimulator.org/wiki/Dependencies +for more information. + +To run OpenSim, from the unpacked distribution type: -From the distribution type: - * ./runprebuild.sh - * nant * cd bin - * edit OpenSim.ini and appropriate files in bin/config-include * mono ./OpenSim.exe -See configuring OpenSim +Now see the "Configuring OpenSim" section == Configuring OpenSim == - Helpful resources: -* http://opensimulator.org/wiki/Configuration -* http://opensimulator.org/wiki/Configuring_Regions -* http://opensimulator.org/wiki/Mysql-config When OpenSim starts for the first time, you will be prompted with a series of questions that look something like: @@ -62,6 +59,11 @@ Once you are presented with a prompt that looks like: You have successfully started OpenSim. +Helpful resources: + * http://opensimulator.org/wiki/Configuration + * http://opensimulator.org/wiki/Configuring_Regions + * http://opensimulator.org/wiki/Mysql-config + == Connecting to your OpenSim == By default your sim will be running on http://127.0.0.1:9000. To use From 046a195c2ed34b282e15d1b6ed298f9a469484f7 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 15 Jan 2010 18:16:21 +0000 Subject: [PATCH 4/4] Add "create user" instructions to README.txt Add documentation to [Standalone] accounts_authenticate setting --- README.txt | 7 ++++++- bin/OpenSim.ini.example | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 2aa59ac3ac..ed59bf56b7 100644 --- a/README.txt +++ b/README.txt @@ -59,6 +59,10 @@ Once you are presented with a prompt that looks like: You have successfully started OpenSim. +Before you can log in you will need to create a user account. You can do +this by running the "create user" command on the OpenSim console. This will +ask you a series of questions such as first name, last name and password. + Helpful resources: * http://opensimulator.org/wiki/Configuration * http://opensimulator.org/wiki/Configuring_Regions @@ -68,7 +72,8 @@ Helpful resources: By default your sim will be running on http://127.0.0.1:9000. To use your OpenSim add -loginuri http://127.0.0.1:9000 to your second life -client (running on the same machine as your OpenSim). +client (running on the same machine as your OpenSim). To login, use the +same avatar details that you gave to the "create user" console command. == Bug reports == diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 5f6d874d06..179c536d32 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -290,7 +290,18 @@ [StandAlone] + ; If this is set to true then OpenSim only allows in users who already have accounts. + ; An account can be created using the "create user" console command. + ; + ; If this is set to false then an account is automatically created for a user who logs in + ; without one. PLEASE NOTE THAT IN THIS MODE NO PASSWORD CHECKS ARE PERFORMED. + ; Therefore, any user can log into any account. If accounts_authenticate is later switched to + ; true then the passwords will need to be reset (using the "reset user password" console command) since + ; automatically created accounts have their password set to the string "test". + ; + ; This setting applies to standalone mode only, not grid or other modes. Default is true. accounts_authenticate = true + welcome_message = "Welcome to OpenSimulator" ; Inventory database provider