aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-16 00:15:26 +0000
committerMelanie2010-01-16 00:15:26 +0000
commit8c39392eaa76fd5fad37368675d1463ad6c69195 (patch)
treeda3e872c13d48a7bd6735b351c8b7a0f8a97d77d
parentAllow renaming of items that contain no-mod items (diff)
parentAdd "create user" instructions to README.txt (diff)
downloadopensim-SC-8c39392eaa76fd5fad37368675d1463ad6c69195.zip
opensim-SC-8c39392eaa76fd5fad37368675d1463ad6c69195.tar.gz
opensim-SC-8c39392eaa76fd5fad37368675d1463ad6c69195.tar.bz2
opensim-SC-8c39392eaa76fd5fad37368675d1463ad6c69195.tar.xz
Merge branch 'master' into careminster
-rw-r--r--BUILDING.txt30
-rw-r--r--OpenSim/Framework/AgentUpdateArgs.cs8
-rw-r--r--OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs3
-rw-r--r--README.txt69
-rw-r--r--bin/OpenSim.ini.example11
5 files changed, 89 insertions, 32 deletions
diff --git a/BUILDING.txt b/BUILDING.txt
new file mode 100644
index 0000000..03fb482
--- /dev/null
+++ b/BUILDING.txt
@@ -0,0 +1,30 @@
1== Building OpenSim ==
2
3=== Building on Windows ===
4
5Steps:
6 * runprebuild.bat
7 * Load OpenSim.sln into Visual Studio .NET and build the solution.
8 * chdir bin
9 * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
10 * run OpenSim.exe
11
12=== Building on Linux ===
13
14Prereqs:
15 * Mono >= 2.4.2
16 * Nant >= 0.85
17 * On some Linux distributions you may need to install additional packages.
18 See http://opensimulator.org/wiki/Dependencies for more information.
19
20From the distribution type:
21 * ./runprebuild.sh
22 * nant
23 * cd bin
24 * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
25 * run mono OpenSim.exe
26
27=== References ===
28
29Helpful resources:
30* http://opensimulator.org/wiki/Build_Instructions
diff --git a/OpenSim/Framework/AgentUpdateArgs.cs b/OpenSim/Framework/AgentUpdateArgs.cs
index 7b9ec68..660bc32 100644
--- a/OpenSim/Framework/AgentUpdateArgs.cs
+++ b/OpenSim/Framework/AgentUpdateArgs.cs
@@ -78,5 +78,13 @@ namespace OpenSim.Framework
78 /// </summary> 78 /// </summary>
79 public UUID SessionID; 79 public UUID SessionID;
80 public byte State; 80 public byte State;
81
82 public Vector3 ClientAgentPosition;
83 public bool UseClientAgentPosition;
84
85 public AgentUpdateArgs()
86 {
87 UseClientAgentPosition = false;
88 }
81 } 89 }
82} 90}
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index a1c032e..4eb4bd2 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors
67 IConfig authorizationConfig = source.Configs["AuthorizationService"]; 67 IConfig authorizationConfig = source.Configs["AuthorizationService"];
68 if (authorizationConfig == null) 68 if (authorizationConfig == null)
69 { 69 {
70 m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini"); 70 //m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini");
71 throw new Exception("Authorization connector init error"); 71 throw new Exception("Authorization connector init error");
72 } 72 }
73 73
@@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors
86 bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); 86 bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true);
87 87
88 m_ResponseOnFailure = responseOnFailure; 88 m_ResponseOnFailure = responseOnFailure;
89 m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized");
89 } 90 }
90 91
91 public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID, out string message) 92 public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID, out string message)
diff --git a/README.txt b/README.txt
index 339d687..ed59bf5 100644
--- a/README.txt
+++ b/README.txt
@@ -10,41 +10,38 @@ C#, and can run under Mono or the Microsoft .NET runtimes.
10This is considered an alpha release. Some stuff works, a lot doesn't. 10This is considered an alpha release. Some stuff works, a lot doesn't.
11If it breaks, you get to keep *both* pieces. 11If it breaks, you get to keep *both* pieces.
12 12
13== Installation on Windows == 13== Compiling OpenSim ==
14 14
15Prereqs: 15Please see BUILDING.txt if you downloaded a source distribution and
16 * runprebuild.bat 16need to build OpenSim before running it.
17 * Load OpenSim.sln into Visual Studio .NET and build the solution. 17
18 * chdir bin 18== Running OpenSim on Windows ==
19 * edit OpenSim.ini and appropriate files in bin/config-include 19
20 * OpenSim.exe 20We recommend that you run OpenSim from a command prompt on Windows in order
21 21to capture any errors, though you can also run it by double-clicking
22 Helpful resources: 22bin/OpenSim.exe
23* http://opensimulator.org/wiki/Build_Instructions 23
24 24To run OpenSim from a command prompt
25See configuring OpenSim 25
26 26 * cd to the bin/ directory where you unpacked OpenSim
27== Installation on Linux == 27 * run OpenSim.exe
28 28
29Prereqs: 29Now see the "Configuring OpenSim" section
30 * Mono >= 2.4.2 30
31 * Nant >= 0.86 beta 1 (if building with the .NET framework on Windows), 0.85 (if building with the mono framework) 31== Running OpenSim on Linux ==
32 * sqlite3 or mysql 5.x (you'll need a backend database) 32
33 33You will need Mono >= 2.4.2 to run OpenSim. On some Linux distributions you
34From the distribution type: 34may need to install additional packages. See http://opensimulator.org/wiki/Dependencies
35 * ./runprebuild.sh 35for more information.
36 * nant 36
37To run OpenSim, from the unpacked distribution type:
38
37 * cd bin 39 * cd bin
38 * edit OpenSim.ini and appropriate files in bin/config-include
39 * mono ./OpenSim.exe 40 * mono ./OpenSim.exe
40 41
41See configuring OpenSim 42Now see the "Configuring OpenSim" section
42 43
43== Configuring OpenSim == 44== Configuring OpenSim ==
44 Helpful resources:
45* http://opensimulator.org/wiki/Configuration
46* http://opensimulator.org/wiki/Configuring_Regions
47* http://opensimulator.org/wiki/Mysql-config
48 45
49When OpenSim starts for the first time, you will be prompted with a 46When OpenSim starts for the first time, you will be prompted with a
50series of questions that look something like: 47series of questions that look something like:
@@ -62,11 +59,21 @@ Once you are presented with a prompt that looks like:
62 59
63You have successfully started OpenSim. 60You have successfully started OpenSim.
64 61
62Before you can log in you will need to create a user account. You can do
63this by running the "create user" command on the OpenSim console. This will
64ask you a series of questions such as first name, last name and password.
65
66Helpful resources:
67 * http://opensimulator.org/wiki/Configuration
68 * http://opensimulator.org/wiki/Configuring_Regions
69 * http://opensimulator.org/wiki/Mysql-config
70
65== Connecting to your OpenSim == 71== Connecting to your OpenSim ==
66 72
67By default your sim will be running on http://127.0.0.1:9000. To use 73By default your sim will be running on http://127.0.0.1:9000. To use
68your OpenSim add -loginuri http://127.0.0.1:9000 to your second life 74your OpenSim add -loginuri http://127.0.0.1:9000 to your second life
69client (running on the same machine as your OpenSim). 75client (running on the same machine as your OpenSim). To login, use the
76same avatar details that you gave to the "create user" console command.
70 77
71== Bug reports == 78== Bug reports ==
72 79
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 7ee3e51..c96e938 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -290,7 +290,18 @@
290 290
291 291
292[StandAlone] 292[StandAlone]
293 ; If this is set to true then OpenSim only allows in users who already have accounts.
294 ; An account can be created using the "create user" console command.
295 ;
296 ; If this is set to false then an account is automatically created for a user who logs in
297 ; without one. PLEASE NOTE THAT IN THIS MODE NO PASSWORD CHECKS ARE PERFORMED.
298 ; Therefore, any user can log into any account. If accounts_authenticate is later switched to
299 ; true then the passwords will need to be reset (using the "reset user password" console command) since
300 ; automatically created accounts have their password set to the string "test".
301 ;
302 ; This setting applies to standalone mode only, not grid or other modes. Default is true.
293 accounts_authenticate = true 303 accounts_authenticate = true
304
294 welcome_message = "Welcome to OpenSimulator" 305 welcome_message = "Welcome to OpenSimulator"
295 306
296 ; Inventory database provider 307 ; Inventory database provider