aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.sln242
-rw-r--r--OpenSim/OpenSim.Region/Estate/EstateManager.cs4
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj32
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.dll.build32
-rw-r--r--OpenSim/OpenSim.Region/ParcelManager.cs8
-rw-r--r--OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scene/Entities/Entity.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs8
-rw-r--r--OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs (renamed from OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs)2
-rw-r--r--OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs (renamed from OpenSim/OpenSim.Region/Scene/World.Scripting.cs)2
-rw-r--r--OpenSim/OpenSim.Region/Scene/Scene.cs (renamed from OpenSim/OpenSim.Region/Scene/World.cs)4
-rw-r--r--OpenSim/OpenSim.Region/Scene/SceneBase.cs (renamed from OpenSim/OpenSim.Region/Scene/WorldBase.cs)2
-rw-r--r--OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs4
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs6
15 files changed, 203 insertions, 149 deletions
diff --git a/OpenSim.sln b/OpenSim.sln
index 9cdc069..891578f 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual C# Express 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
@@ -43,97 +43,151 @@ EndProject
43Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" 43Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
44EndProject 44EndProject
45Global 45Global
46 GlobalSection(SolutionConfigurationPlatforms) = preSolution 46 GlobalSection(SolutionConfigurationPlatforms) = preSolution
47 Debug|Any CPU = Debug|Any CPU 47 Debug|Any CPU = Debug|Any CPU
48 Release|Any CPU = Release|Any CPU 48 Release|Any CPU = Release|Any CPU
49 EndGlobalSection 49 EndGlobalSection
50 GlobalSection(ProjectConfigurationPlatforms) = postSolution 50 GlobalSection(ProjectDependencies) = postSolution
51 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 51 ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
52 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 52 ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
53 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 53 ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
54 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 54 ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
55 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 55 ({196916AF-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
56 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 56 ({196916AF-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
57 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 57 ({196916AF-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
58 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 58 ({196916AF-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
59 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 59 ({196916AF-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
60 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 60 ({196916AF-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
61 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 61 ({196916AF-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
62 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 62 ({196916AF-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000})
63 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 63 ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
64 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 64 ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
65 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 65 ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
66 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 66 ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
67 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 67 ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
68 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 68 ({438A9556-0000-0000-0000-000000000000}).10 = ({196916AF-0000-0000-0000-000000000000})
69 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 69 ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})
70 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 70 ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000})
71 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 71 ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000})
72 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 72 ({438A9556-0000-0000-0000-000000000000}).14 = ({1938EB12-0000-0000-0000-000000000000})
73 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 73 ({438A9556-0000-0000-0000-000000000000}).15 = ({8E81D43C-0000-0000-0000-000000000000})
74 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 74 ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
75 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 75 ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
76 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 76 ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
77 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 77 ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
78 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 78 ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
79 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 79 ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
80 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 80 ({632E1BFD-0000-0000-0000-000000000000}).11 = ({1938EB12-0000-0000-0000-000000000000})
81 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 81 ({632E1BFD-0000-0000-0000-000000000000}).12 = ({8E81D43C-0000-0000-0000-000000000000})
82 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 82 ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
83 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 83 ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
84 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 84 ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
85 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 85 ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
86 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 86 ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
87 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 87 ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
88 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 88 ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
89 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 89 ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
90 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 90 ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
91 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 91 ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
92 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 92 ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
93 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 93 ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
94 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 94 ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
95 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 95 ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
96 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 96 ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
97 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 97 ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
98 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 98 ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
99 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 99 ({1938EB12-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
100 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 100 ({97A82740-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
101 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 101 ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
102 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 102 ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
103 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 103 EndGlobalSection
104 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 104 GlobalSection(ProjectConfigurationPlatforms) = postSolution
105 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 105 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 106 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
107 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 107 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
108 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 108 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
109 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 109 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 110 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
111 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 111 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
112 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 112 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
113 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 113 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 114 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
115 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 115 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
116 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 116 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
117 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 117 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 118 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
119 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 119 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
120 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 120 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
121 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 121 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
122 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 122 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
123 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 123 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
124 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 124 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
125 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 125 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 126 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
127 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 127 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
128 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 128 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
129 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 129 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
130 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 130 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
131 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 131 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
132 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 132 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
133 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 133 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
134 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 134 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
135 EndGlobalSection 135 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
136 GlobalSection(SolutionProperties) = preSolution 136 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
137 HideSolutionNode = FALSE 137 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
138 EndGlobalSection 138 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
139 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
140 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
141 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
143 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
144 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
145 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
147 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
148 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
149 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
151 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
152 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
153 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
154 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
155 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
156 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
157 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
159 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
160 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
161 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
162 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
163 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
164 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
165 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
166 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
167 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
168 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
169 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
170 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
171 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
172 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
173 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
175 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
176 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
177 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
178 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
179 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
180 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
181 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
183 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
184 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
185 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
186 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
187 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
188 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
189 EndGlobalSection
190 GlobalSection(SolutionProperties) = preSolution
191 HideSolutionNode = FALSE
192 EndGlobalSection
139EndGlobal 193EndGlobal
diff --git a/OpenSim/OpenSim.Region/Estate/EstateManager.cs b/OpenSim/OpenSim.Region/Estate/EstateManager.cs
index 688182d..875defd 100644
--- a/OpenSim/OpenSim.Region/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/Estate/EstateManager.cs
@@ -45,10 +45,10 @@ namespace OpenSim.Region.Estate
45 /// </summary> 45 /// </summary>
46 public class EstateManager 46 public class EstateManager
47 { 47 {
48 private World m_world; 48 private Scene m_world;
49 private RegionInfo m_regInfo; 49 private RegionInfo m_regInfo;
50 50
51 public EstateManager(World world,RegionInfo reginfo) 51 public EstateManager(Scene world,RegionInfo reginfo)
52 { 52 {
53 m_world = world; //Estate settings found at world.m_regInfo.estateSettings 53 m_world = world; //Estate settings found at world.m_regInfo.estateSettings
54 m_regInfo = reginfo; 54 m_regInfo = reginfo;
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 4447819..ff916d1 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -136,52 +136,52 @@
136 <Compile Include="Estate\EstateManager.cs"> 136 <Compile Include="Estate\EstateManager.cs">
137 <SubType>Code</SubType> 137 <SubType>Code</SubType>
138 </Compile> 138 </Compile>
139 <Compile Include="World\World.cs"> 139 <Compile Include="Scene\Scene.cs">
140 <SubType>Code</SubType> 140 <SubType>Code</SubType>
141 </Compile> 141 </Compile>
142 <Compile Include="World\World.PacketHandlers.cs"> 142 <Compile Include="Scene\Scene.PacketHandlers.cs">
143 <SubType>Code</SubType> 143 <SubType>Code</SubType>
144 </Compile> 144 </Compile>
145 <Compile Include="World\World.Scripting.cs"> 145 <Compile Include="Scene\Scene.Scripting.cs">
146 <SubType>Code</SubType> 146 <SubType>Code</SubType>
147 </Compile> 147 </Compile>
148 <Compile Include="World\WorldBase.cs"> 148 <Compile Include="Scene\SceneBase.cs">
149 <SubType>Code</SubType> 149 <SubType>Code</SubType>
150 </Compile> 150 </Compile>
151 <Compile Include="World\Entities\Avatar.Animations.cs"> 151 <Compile Include="Scene\Entities\Avatar.Animations.cs">
152 <SubType>Code</SubType> 152 <SubType>Code</SubType>
153 </Compile> 153 </Compile>
154 <Compile Include="World\Entities\Avatar.cs"> 154 <Compile Include="Scene\Entities\Avatar.cs">
155 <SubType>Code</SubType> 155 <SubType>Code</SubType>
156 </Compile> 156 </Compile>
157 <Compile Include="World\Entities\Avatar.Update.cs"> 157 <Compile Include="Scene\Entities\Avatar.Update.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="World\Entities\Entity.cs"> 160 <Compile Include="Scene\Entities\Entity.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="World\Entities\Primitive.cs"> 163 <Compile Include="Scene\Entities\Primitive.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="World\Entities\SceneObject.cs"> 166 <Compile Include="Scene\Entities\SceneObject.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="World\scripting\IScriptContext.cs"> 169 <Compile Include="Scene\scripting\IScriptContext.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="World\scripting\IScriptEntity.cs"> 172 <Compile Include="Scene\scripting\IScriptEntity.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="World\scripting\IScriptHandler.cs"> 175 <Compile Include="Scene\scripting\IScriptHandler.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 <Compile Include="World\scripting\Script.cs"> 178 <Compile Include="Scene\scripting\Script.cs">
179 <SubType>Code</SubType> 179 <SubType>Code</SubType>
180 </Compile> 180 </Compile>
181 <Compile Include="World\scripting\ScriptFactory.cs"> 181 <Compile Include="Scene\scripting\ScriptFactory.cs">
182 <SubType>Code</SubType> 182 <SubType>Code</SubType>
183 </Compile> 183 </Compile>
184 <Compile Include="World\scripting\Scripts\FollowRandomAvatar.cs"> 184 <Compile Include="Scene\scripting\Scripts\FollowRandomAvatar.cs">
185 <SubType>Code</SubType> 185 <SubType>Code</SubType>
186 </Compile> 186 </Compile>
187 </ItemGroup> 187 </ItemGroup>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index f0d1a34..a49c08f 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,22 +13,22 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="ParcelManager.cs" /> 14 <include name="ParcelManager.cs" />
15 <include name="Estate/EstateManager.cs" /> 15 <include name="Estate/EstateManager.cs" />
16 <include name="World/World.cs" /> 16 <include name="Scene/Scene.cs" />
17 <include name="World/World.PacketHandlers.cs" /> 17 <include name="Scene/Scene.PacketHandlers.cs" />
18 <include name="World/World.Scripting.cs" /> 18 <include name="Scene/Scene.Scripting.cs" />
19 <include name="World/WorldBase.cs" /> 19 <include name="Scene/SceneBase.cs" />
20 <include name="World/Entities/Avatar.Animations.cs" /> 20 <include name="Scene/Entities/Avatar.Animations.cs" />
21 <include name="World/Entities/Avatar.cs" /> 21 <include name="Scene/Entities/Avatar.cs" />
22 <include name="World/Entities/Avatar.Update.cs" /> 22 <include name="Scene/Entities/Avatar.Update.cs" />
23 <include name="World/Entities/Entity.cs" /> 23 <include name="Scene/Entities/Entity.cs" />
24 <include name="World/Entities/Primitive.cs" /> 24 <include name="Scene/Entities/Primitive.cs" />
25 <include name="World/Entities/SceneObject.cs" /> 25 <include name="Scene/Entities/SceneObject.cs" />
26 <include name="World/scripting/IScriptContext.cs" /> 26 <include name="Scene/scripting/IScriptContext.cs" />
27 <include name="World/scripting/IScriptEntity.cs" /> 27 <include name="Scene/scripting/IScriptEntity.cs" />
28 <include name="World/scripting/IScriptHandler.cs" /> 28 <include name="Scene/scripting/IScriptHandler.cs" />
29 <include name="World/scripting/Script.cs" /> 29 <include name="Scene/scripting/Script.cs" />
30 <include name="World/scripting/ScriptFactory.cs" /> 30 <include name="Scene/scripting/ScriptFactory.cs" />
31 <include name="World/scripting/Scripts/FollowRandomAvatar.cs" /> 31 <include name="Scene/scripting/Scripts/FollowRandomAvatar.cs" />
32 </sources> 32 </sources>
33 <references basedir="${project::get-base-directory()}"> 33 <references basedir="${project::get-base-directory()}">
34 <lib> 34 <lib>
diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/OpenSim.Region/ParcelManager.cs
index 37dd24f..081f9a2 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/OpenSim.Region/ParcelManager.cs
@@ -74,13 +74,13 @@ namespace OpenSim.Region
74 private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1; 74 private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
75 private int[,] parcelIDList = new int[64, 64]; 75 private int[,] parcelIDList = new int[64, 64];
76 76
77 private World m_world; 77 private Scene m_world;
78 private RegionInfo m_regInfo; 78 private RegionInfo m_regInfo;
79 79
80 #endregion 80 #endregion
81 81
82 #region Constructors 82 #region Constructors
83 public ParcelManager(World world, RegionInfo reginfo) 83 public ParcelManager(Scene world, RegionInfo reginfo)
84 { 84 {
85 85
86 m_world = world; 86 m_world = world;
@@ -497,7 +497,7 @@ namespace OpenSim.Region
497 { 497 {
498 #region Member Variables 498 #region Member Variables
499 public ParcelData parcelData = new ParcelData(); 499 public ParcelData parcelData = new ParcelData();
500 public World m_world; 500 public Scene m_world;
501 501
502 private bool[,] parcelBitmap = new bool[64, 64]; 502 private bool[,] parcelBitmap = new bool[64, 64];
503 503
@@ -505,7 +505,7 @@ namespace OpenSim.Region
505 505
506 506
507 #region Constructors 507 #region Constructors
508 public Parcel(LLUUID owner_id, bool is_group_owned, World world) 508 public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)
509 { 509 {
510 m_world = world; 510 m_world = world;
511 parcelData.ownerID = owner_id; 511 parcelData.ownerID = owner_id;
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
index c88e0cc..989c53d 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region
70 /// <param name="world"></param> 70 /// <param name="world"></param>
71 /// <param name="clientThreads"></param> 71 /// <param name="clientThreads"></param>
72 /// <param name="regionDat"></param> 72 /// <param name="regionDat"></param>
73 public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo) 73 public Avatar(IClientAPI theClient, Scene world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo)
74 { 74 {
75 75
76 m_world = world; 76 m_world = world;
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs b/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
index 3d6ba64..9e288d7 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region
44 protected List<Entity> children; 44 protected List<Entity> children;
45 protected LLVector3 m_pos; 45 protected LLVector3 m_pos;
46 protected PhysicsActor _physActor; 46 protected PhysicsActor _physActor;
47 protected World m_world; 47 protected Scene m_world;
48 protected string m_name; 48 protected string m_name;
49 49
50 /// <summary> 50 /// <summary>
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
index 6efdd66..aa747d3 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region
92 /// <param name="clientThreads"></param> 92 /// <param name="clientThreads"></param>
93 /// <param name="regionHandle"></param> 93 /// <param name="regionHandle"></param>
94 /// <param name="world"></param> 94 /// <param name="world"></param>
95 public Primitive( ulong regionHandle, World world) 95 public Primitive( ulong regionHandle, Scene world)
96 { 96 {
97 // m_clientThreads = clientThreads; 97 // m_clientThreads = clientThreads;
98 m_regionHandle = regionHandle; 98 m_regionHandle = regionHandle;
@@ -108,7 +108,7 @@ namespace OpenSim.Region
108 /// <param name="addPacket"></param> 108 /// <param name="addPacket"></param>
109 /// <param name="ownerID"></param> 109 /// <param name="ownerID"></param>
110 /// <param name="localID"></param> 110 /// <param name="localID"></param>
111 public Primitive(ulong regionHandle, World world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID) 111 public Primitive(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
112 { 112 {
113 // m_clientThreads = clientThreads; 113 // m_clientThreads = clientThreads;
114 m_regionHandle = regionHandle; 114 m_regionHandle = regionHandle;
@@ -126,7 +126,7 @@ namespace OpenSim.Region
126 /// <param name="owner"></param> 126 /// <param name="owner"></param>
127 /// <param name="fullID"></param> 127 /// <param name="fullID"></param>
128 /// <param name="localID"></param> 128 /// <param name="localID"></param>
129 public Primitive( ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID) 129 public Primitive( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)
130 { 130 {
131 // m_clientThreads = clientThreads; 131 // m_clientThreads = clientThreads;
132 m_regionHandle = regionHandle; 132 m_regionHandle = regionHandle;
@@ -148,7 +148,7 @@ namespace OpenSim.Region
148 /// <param name="owner"></param> 148 /// <param name="owner"></param>
149 /// <param name="localID"></param> 149 /// <param name="localID"></param>
150 /// <param name="position"></param> 150 /// <param name="position"></param>
151 public Primitive( ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position) 151 public Primitive( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)
152 { 152 {
153 //m_clientThreads = clientThreads; 153 //m_clientThreads = clientThreads;
154 m_regionHandle = regionHandle; 154 m_regionHandle = regionHandle;
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs b/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
index 7284b73..e15e871 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region
42 private LLUUID rootUUID; 42 private LLUUID rootUUID;
43 //private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); 43 //private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>();
44 protected Primitive rootPrimitive; 44 protected Primitive rootPrimitive;
45 private World m_world; 45 private Scene m_world;
46 protected ulong regionHandle; 46 protected ulong regionHandle;
47 47
48 /// <summary> 48 /// <summary>
diff --git a/OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
index 85ca247..1c6fbcd 100644
--- a/OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Utilities;
38 38
39namespace OpenSim.Region 39namespace OpenSim.Region
40{ 40{
41 public partial class World 41 public partial class Scene
42 { 42 {
43 /// <summary> 43 /// <summary>
44 /// 44 ///
diff --git a/OpenSim/OpenSim.Region/Scene/World.Scripting.cs b/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
index e4b5d02..df5ca9b 100644
--- a/OpenSim/OpenSim.Region/Scene/World.Scripting.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
@@ -37,7 +37,7 @@ using libsecondlife;
37 37
38namespace OpenSim.Region 38namespace OpenSim.Region
39{ 39{
40 public partial class World 40 public partial class Scene
41 { 41 {
42 private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>(); 42 private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
43 43
diff --git a/OpenSim/OpenSim.Region/Scene/World.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
index 40eb7ef..e3ffca4 100644
--- a/OpenSim/OpenSim.Region/Scene/World.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region
49{ 49{
50 public delegate bool FilterAvatarList(Avatar avatar); 50 public delegate bool FilterAvatarList(Avatar avatar);
51 51
52 public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI 52 public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
53 { 53 {
54 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); 54 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
55 protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars; 55 protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
@@ -96,7 +96,7 @@ namespace OpenSim.Region
96 /// <param name="clientThreads">Dictionary to contain client threads</param> 96 /// <param name="clientThreads">Dictionary to contain client threads</param>
97 /// <param name="regionHandle">Region Handle for this region</param> 97 /// <param name="regionHandle">Region Handle for this region</param>
98 /// <param name="regionName">Region Name for this region</param> 98 /// <param name="regionName">Region Name for this region</param>
99 public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan) 99 public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)
100 { 100 {
101 try 101 try
102 { 102 {
diff --git a/OpenSim/OpenSim.Region/Scene/WorldBase.cs b/OpenSim/OpenSim.Region/Scene/SceneBase.cs
index d77d2cf..114b6a3 100644
--- a/OpenSim/OpenSim.Region/Scene/WorldBase.cs
+++ b/OpenSim/OpenSim.Region/Scene/SceneBase.cs
@@ -42,7 +42,7 @@ using OpenSim.Terrain;
42 42
43namespace OpenSim.Region 43namespace OpenSim.Region
44{ 44{
45 public abstract class WorldBase : IWorld 45 public abstract class SceneBase : IWorld
46 { 46 {
47 public Dictionary<libsecondlife.LLUUID, Entity> Entities; 47 public Dictionary<libsecondlife.LLUUID, Entity> Entities;
48 protected Dictionary<uint, IClientAPI> m_clientThreads; 48 protected Dictionary<uint, IClientAPI> m_clientThreads;
diff --git a/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
index f1a236f..e45473b 100644
--- a/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
+++ b/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Scripting
40 40
41 public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity 41 public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
42 { 42 {
43 private World m_world; 43 private Scene m_world;
44 private Script m_script; 44 private Script m_script;
45 private Entity m_entity; 45 private Entity m_entity;
46 46
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Scripting
57 m_script.OnFrame(this); 57 m_script.OnFrame(this);
58 } 58 }
59 59
60 public ScriptHandler(Script script, Entity entity, World world) 60 public ScriptHandler(Script script, Entity entity, Scene world)
61 { 61 {
62 m_script = script; 62 m_script = script;
63 m_entity = entity; 63 m_entity = entity;
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 0d177b9..b419101 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -180,7 +180,7 @@ namespace OpenSim
180 protected override void SetupWorld() 180 protected override void SetupWorld()
181 { 181 {
182 IGenericConfig regionConfig; 182 IGenericConfig regionConfig;
183 World LocalWorld; 183 Scene LocalWorld;
184 UDPServer udpServer; 184 UDPServer udpServer;
185 RegionInfo regionDat = new RegionInfo(); 185 RegionInfo regionDat = new RegionInfo();
186 AuthenticateSessionsBase authenBase; 186 AuthenticateSessionsBase authenBase;
@@ -234,7 +234,7 @@ namespace OpenSim
234 m_console.componentname = "Region " + regionData.RegionName; 234 m_console.componentname = "Region " + regionData.RegionName;
235 */ 235 */
236 236
237 LocalWorld = new World(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager); 237 LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager);
238 this.m_localWorld.Add(LocalWorld); 238 this.m_localWorld.Add(LocalWorld);
239 //LocalWorld.InventoryCache = InventoryCache; 239 //LocalWorld.InventoryCache = InventoryCache;
240 //LocalWorld.AssetCache = AssetCache; 240 //LocalWorld.AssetCache = AssetCache;
@@ -392,7 +392,7 @@ namespace OpenSim
392 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating"); 392 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating");
393 for (int i = 0; i < m_localWorld.Count; i++) 393 for (int i = 0; i < m_localWorld.Count; i++)
394 { 394 {
395 ((World)m_localWorld[i]).Close(); 395 ((Scene)m_localWorld[i]).Close();
396 } 396 }
397 m_console.Close(); 397 m_console.Close();
398 Environment.Exit(0); 398 Environment.Exit(0);
generated by cgit v1.1 at 2024-12-25 12:33:52 +0000