aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs4
-rw-r--r--bin/OpenSim.ini.example56
2 files changed, 33 insertions, 27 deletions
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index 0dafdc3..21a416a 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -100,8 +100,8 @@ namespace OpenSim.Region.Environment.Modules
100 m_configured = true; 100 m_configured = true;
101 try 101 try
102 { 102 {
103 m_enablePersist = source.Configs["Appearance"].GetBoolean("persist", false); 103 m_enablePersist = source.Configs["Startup"].GetBoolean("appearance_persist", false);
104 m_connectionString = source.Configs["Appearance"].GetString("connection_string", ""); 104 m_connectionString = source.Configs["Startup"].GetString("appearance_connection_string", "");
105 } 105 }
106 catch (Exception) 106 catch (Exception)
107 { 107 {
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 21d236f..ce2f02e 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1,20 +1,9 @@
1[Startup] 1[Startup]
2gridmode = false 2gridmode = false
3 3
4; Select a mesher here. ZeroMesher is save and fast. 4; ##
5; ZeroMesher also means that the physics engine models the physics of prims 5; ## STORAGE
6; sticking to the basic shapes the engine does support. Usually this is only a box. 6; ##
7; Meshmerizer gives a better handling of complex prims by using triangle meshes.
8; Note, that only ODE physics currently deals with meshed prims in a satisfactoring way
9;
10meshing = ZeroMesher
11;meshing = Meshmerizer
12
13; Choose one of the physics engines below
14physics = basicphysics
15;physics = POS
16;physics = OpenDynamicsEngine
17;physics = modified_BulletX
18 7
19; *** Prim Storage - only leave one storage_plugin uncommented *** 8; *** Prim Storage - only leave one storage_plugin uncommented ***
20; --- The NullStorage stores nothing - effectively disabling persistence: 9; --- The NullStorage stores nothing - effectively disabling persistence:
@@ -39,9 +28,9 @@ storage_connection_string="URI=file:OpenSim.db,version=3";
39; 28;
40storage_prim_inventories = true 29storage_prim_inventories = true
41 30
42startup_console_commands_file = "startup_commands.txt" 31; Avatar appearance persistence
43shutdown_console_commands_file = "shutdown_commands.txt" 32appearance_persist = false
44serverside_object_permissions = false 33appearance_connection_string = "Data Source=localhost;Database=avatar_appearance;User ID=root;Password=xxxx;pooling=false;"
45 34
46; Select the type of database to use for asset storage 35; Select the type of database to use for asset storage
47;asset_database = "db4o" 36;asset_database = "db4o"
@@ -49,7 +38,32 @@ asset_database = "sqlite"
49;asset_database = "grid" 38;asset_database = "grid"
50;asset_database = "mssql" 39;asset_database = "mssql"
51 40
41
42
43; ##
44; ## PHYSICS
45; ##
46
47; Select a mesher here. ZeroMesher is save and fast.
48; ZeroMesher also means that the physics engine models the physics of prims
49; sticking to the basic shapes the engine does support. Usually this is only a box.
50; Meshmerizer gives a better handling of complex prims by using triangle meshes.
51; Note, that only ODE physics currently deals with meshed prims in a satisfactoring way
52;
53meshing = ZeroMesher
54;meshing = Meshmerizer
55
56; Choose one of the physics engines below
57physics = basicphysics
58;physics = POS
59;physics = OpenDynamicsEngine
60;physics = modified_BulletX
61
62
52verbose = true 63verbose = true
64startup_console_commands_file = "startup_commands.txt"
65shutdown_console_commands_file = "shutdown_commands.txt"
66serverside_object_permissions = false
53 67
54 68
55; if you would like to allow prim to be physical and move by physics with the physical checkbox in the client set this to true. 69; if you would like to allow prim to be physical and move by physics with the physical checkbox in the client set this to true.
@@ -58,9 +72,6 @@ physical_prim = true
58; To run a script every few minutes, set the script filename here 72; To run a script every few minutes, set the script filename here
59; timer_Script = "filename" 73; timer_Script = "filename"
60 74
61; If you would like to see into this region from neighbor simulators
62see_into_this_sim_from_neighbor = true
63
64[StandAlone] 75[StandAlone]
65accounts_authenticate = true 76accounts_authenticate = true
66welcome_message = "Welcome to OpenSim" 77welcome_message = "Welcome to OpenSim"
@@ -244,8 +255,3 @@ CompileWithDebugInformation=true
244; Remove old scripts on next startup 255; Remove old scripts on next startup
245CleanUpOldScriptsOnStartup=true 256CleanUpOldScriptsOnStartup=true
246 257
247
248[Appearance]
249persist = false
250connection_string = "Data Source=localhost;Database=avatar_appearance;User ID=root;Password=xxxx;pooling=false;"
251