From f921cb712e67893b44496192e5297335ed65caf7 Mon Sep 17 00:00:00 2001
From: onefang
Date: Tue, 28 May 2019 06:19:38 +1000
Subject: Add [Region] .ini block.

For including actual region definition in the normal .ini stack.

Same as the usual Region.ini format, except we add a RegionName
parameter.
---
 example/config/sim_skeleton/My_sim.xml  | 20 --------------------
 example/config/sim_skeleton/ThisSim.ini | 23 ++++++++++++++++++++---
 2 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 example/config/sim_skeleton/My_sim.xml

(limited to 'example')

diff --git a/example/config/sim_skeleton/My_sim.xml b/example/config/sim_skeleton/My_sim.xml
deleted file mode 100644
index f71df57..0000000
--- a/example/config/sim_skeleton/My_sim.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Nini>
-  <Section Name="SIM_NAME">
-    <Key Name="RegionUUID" Value="SIM_UUID" />
-    <Key Name="Location" Value="SIM_POS" />
-    <Key Name="InternalAddress" Value="SIM_IP" />
-    <Key Name="InternalPort" Value="SIM_INT_PORT" />
-    <Key Name="AllowAlternatePorts" Value="False" />
-    <Key Name="ExternalHostName" Value="SIM_URL" />
-    <Key Name="RegionType" Value="private sim" />
-    <Key Name="SizeX" Value="SIM_SIZE" />
-    <Key Name="SizeY" Value="SIM_SIZE" />
-    <Key Name="SizeZ" Value="16384" />
-    <Key Name="MaxAgents" Value="100" />
-    <Key Name="MaxPrims" Value="45000" />
-    <Key Name="PhysicalPrimMax" Value="640" />
-    <Key Name="NonphysicalPrimMax" Value="2560" />
-    <Key Name="ClampPrimSize" Value="False" />
-    <Key Name="MaptileStaticUUID" Value="00000000-0000-0000-0000-000000000000" />
-  </Section>
-</Nini>
diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini
index 140cf3b..a1a209a 100644
--- a/example/config/sim_skeleton/ThisSim.ini
+++ b/example/config/sim_skeleton/ThisSim.ini
@@ -5,7 +5,25 @@
     PIDFile = "${Paths|CachePath}/sim${Const|mysim}.pid"
     LogFile = "${Paths|LogPath}/OpenSim_sim${Const|mysim}.log"
     ConsoleHistoryFile = "${Paths|LogPath}/OpenSimConsoleHistory_sim${Const|mysim}.txt"
-    regionload_regionsdir="../../config/sim${Const|mysim}"
+
+[Region]
+    RegionName = "SIM_NAME"
+    RegionUUID = "SIM_UUID"
+    Location = "SIM_POS"
+    InternalAddress = "SIM_IP"
+    InternalPort = "SIM_INT_PORT"
+    AllowAlternatePorts = False
+    ExternalHostName = "SIM_URL"
+    RegionType = "private sim"
+    SizeX = SIM_SIZE
+    SizeY = SIM_SIZE
+    SizeZ = 16384
+    MaxAgents = 100
+    MaxPrims = 45000
+    PhysicalPrimMax = 640
+    NonphysicalPrimMax = 2560
+    ClampPrimSize = False
+    MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
 
 [Map]
     enablePosition = true
@@ -21,5 +39,4 @@
     Include-Performance = "config-include/SimBalanced.ini"
     ; Include-Performance = "config-include/SimDefault.ini"
     ; Include-Performance = "config-include/SimLean.ini"
-                                                                                                                                                                                               │ 2621 mysql     20   0 4131620 483696  17640 S   0.3  2.9   8:07.82 /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/x86_64-linux-gnu/mariadb18/plugin --user=m+ 
- 
\ No newline at end of file
+
-- 
cgit v1.1