diff options
-rw-r--r-- | bin/OpenSimDefaults.ini | 6 | ||||
-rw-r--r-- | example/config/sim_skeleton/ThisSim.ini | 3 | ||||
-rwxr-xr-x | scripts/install/create_sim.sh | 9 |
3 files changed, 6 insertions, 12 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 0dc565b..a42c831 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -417,6 +417,12 @@ | |||
417 | TelehubAllowLandmark = true | 417 | TelehubAllowLandmark = true |
418 | 418 | ||
419 | 419 | ||
420 | ; Normally this section goes in the ThisSim.ini file, but this is common for all. | ||
421 | [Region] | ||
422 | InternalAddress = "0.0.0.0" | ||
423 | ExternalHostName = "${Const|HostName}" | ||
424 | |||
425 | |||
420 | [Map] | 426 | [Map] |
421 | ; Map tile options. | 427 | ; Map tile options. |
422 | ; If true, then maptiles are generated using the MapImageModule below. | 428 | ; If true, then maptiles are generated using the MapImageModule below. |
diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini index db3cf94..44749bb 100644 --- a/example/config/sim_skeleton/ThisSim.ini +++ b/example/config/sim_skeleton/ThisSim.ini | |||
@@ -11,10 +11,7 @@ | |||
11 | RegionName = "SIM_NAME" | 11 | RegionName = "SIM_NAME" |
12 | RegionUUID = "SIM_UUID" | 12 | RegionUUID = "SIM_UUID" |
13 | Location = "SIM_POS" | 13 | Location = "SIM_POS" |
14 | InternalAddress = "SIM_IP" | ||
15 | InternalPort = "SIM_INT_PORT" | 14 | InternalPort = "SIM_INT_PORT" |
16 | AllowAlternatePorts = False | ||
17 | ExternalHostName = "${Const|HostName}" | ||
18 | RegionType = "private sim" | 15 | RegionType = "private sim" |
19 | SizeX = SIM_SIZE | 16 | SizeX = SIM_SIZE |
20 | SizeY = SIM_SIZE | 17 | SizeY = SIM_SIZE |
diff --git a/scripts/install/create_sim.sh b/scripts/install/create_sim.sh index 0aa0941..71aabc7 100755 --- a/scripts/install/create_sim.sh +++ b/scripts/install/create_sim.sh | |||
@@ -38,14 +38,6 @@ then | |||
38 | SIZE="256" | 38 | SIZE="256" |
39 | fi | 39 | fi |
40 | 40 | ||
41 | if [ "x${IP}" = "x" ] | ||
42 | then | ||
43 | IP="0.0.0.0" | ||
44 | echo "WARNING setting the InternalAddress to ${IP}, this may not be what you want." | ||
45 | # echo " 0.0.0.0 will work for a single sim per physical machine, otherwise we need the real internal IP." | ||
46 | # According to the OpenSim docs, 0.0.0.0 means to listen on all NICs the machine has, which should work fine. | ||
47 | fi | ||
48 | |||
49 | # Wow, the hoops we have to jump through to avoid octal. | 41 | # Wow, the hoops we have to jump through to avoid octal. |
50 | if [ 9 -gt $k ]; then | 42 | if [ 9 -gt $k ]; then |
51 | NUM=$(printf '0%1s' $(( 10#$k + 1 )) ) | 43 | NUM=$(printf '0%1s' $(( 10#$k + 1 )) ) |
@@ -64,7 +56,6 @@ cd sim${NUM} | |||
64 | sed -i "s@SIM_NAME@${NAME}@g" ThisSim.ini | 56 | sed -i "s@SIM_NAME@${NAME}@g" ThisSim.ini |
65 | sed -i "s@SIM_UUID@${UUID}@g" ThisSim.ini | 57 | sed -i "s@SIM_UUID@${UUID}@g" ThisSim.ini |
66 | sed -i "s@SIM_POS@${LOCATION}@g" ThisSim.ini | 58 | sed -i "s@SIM_POS@${LOCATION}@g" ThisSim.ini |
67 | sed -i "s@SIM_IP@${IP}@g" ThisSim.ini | ||
68 | sed -i "s@SIM_INT_PORT@$(( ${PORT} + 1 ))@g" ThisSim.ini | 59 | sed -i "s@SIM_INT_PORT@$(( ${PORT} + 1 ))@g" ThisSim.ini |
69 | sed -i "s@SIM_SIZE@${SIZE}@g" ThisSim.ini | 60 | sed -i "s@SIM_SIZE@${SIZE}@g" ThisSim.ini |
70 | 61 | ||