aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
-rw-r--r--bin/Regions/Regions.ini.example47
-rw-r--r--prebuild.xml3
3 files changed, 4 insertions, 48 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 6c72edc..da1ccb3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1153,7 +1153,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1153 1153
1154 if (!udpClient.IsConnected) 1154 if (!udpClient.IsConnected)
1155 { 1155 {
1156// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName); 1156 m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
1157 return; 1157 return;
1158 } 1158 }
1159 1159
diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example
deleted file mode 100644
index 54a841d..0000000
--- a/bin/Regions/Regions.ini.example
+++ /dev/null
@@ -1,47 +0,0 @@
1; * This is an example region config file.
2; *
3; * If OpenSimulator is started up without any regions, it will ask you configuration questions to generate a Regions.ini file for you.
4; * So there is no need to change this file directly, it is only for reference.
5; * However, if you prefer you can also copy this file to Regions.ini and appropriately change the parameters below.
6; * Only files ending with .ini and .xml in this directly will be loaded by OpenSimulator.
7; *
8; * You can multiple regions into one file or make one file per region
9; * The section name is the region name
10; *
11
12[Default Region]
13
14; *
15; * You MUST change this! It will NOT be done for you!
16; *
17
18RegionUUID = "11111111-2222-3333-4444-555555555555"
19
20Location = "1000,1000"
21InternalAddress = "127.0.0.1"
22InternalPort = 9000
23AllowAlternatePorts = False
24ExternalHostName = "SYSTEMIP"
25
26; *
27; * Prim data
28; * This allows limiting the sizes of prims and the region prim count
29; *
30
31; NonphysicalPrimMax = 256
32; PhysicalPrimMax = 10
33; ClampPrimSize = False
34; MaxPrims = 15000
35; MaxAgents = 100
36
37; *
38; * Multi-Tenancy. Only set if needed
39; *
40
41; ScopeID = "00000000-0000-0000-0000-000000000000"
42
43; *
44; * Product name (used in search from viewer 1.23
45; *
46
47; RegionType = "Mainland"
diff --git a/prebuild.xml b/prebuild.xml
index fa21722..dc00d40 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1761,6 +1761,8 @@
1761 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1761 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1762 <Reference name="OpenSim.Region.CoreModules"/> 1762 <Reference name="OpenSim.Region.CoreModules"/>
1763 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> 1763 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
1764 <Reference name="OpenSim.Region.Framework.Interfaces"/>
1765 <Reference name="OpenSim.Region.Framework.Scenes"/>
1764 <Reference name="OpenSim.Region.Framework"/> 1766 <Reference name="OpenSim.Region.Framework"/>
1765 <Reference name="OpenSim.Region.Physics.Manager"/> 1767 <Reference name="OpenSim.Region.Physics.Manager"/>
1766 <Reference name="OpenSim.Server.Base"/> 1768 <Reference name="OpenSim.Server.Base"/>
@@ -3177,6 +3179,7 @@
3177 <Reference name="OpenSim.Framework.Servers"/> 3179 <Reference name="OpenSim.Framework.Servers"/>
3178 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3180 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3179 <Reference name="OpenSim.Region.Framework"/> 3181 <Reference name="OpenSim.Region.Framework"/>
3182 <Reference name="OpenSim.Region.Framework.Interfaces"/>
3180 <Reference name="OpenSim.Region.CoreModules"/> 3183 <Reference name="OpenSim.Region.CoreModules"/>
3181 <Reference name="OpenSim.Region.OptionalModules"/> 3184 <Reference name="OpenSim.Region.OptionalModules"/>
3182 <Reference name="OpenSim.Region.Physics.Manager"/> 3185 <Reference name="OpenSim.Region.Physics.Manager"/>