aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.build3
-rw-r--r--OpenSim.sln296
-rw-r--r--OpenSim/Examples/SimpleApp/MyWorld.cs14
-rw-r--r--OpenSim/Examples/SimpleApp/Program.cs6
-rw-r--r--OpenSim/Examples/SimpleApp/SimpleApp.exe.build4
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs2
-rw-r--r--OpenSim/OpenSim.Region/EstateManager.cs2
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj18
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.dll.build6
-rw-r--r--OpenSim/OpenSim.Region/ParcelManager.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Primitive.cs4
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.cs77
-rw-r--r--OpenSim/OpenSim.Region/Scenes/SceneBase.cs6
-rw-r--r--OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs (renamed from OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs)4
-rw-r--r--OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs (renamed from OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs)10
-rw-r--r--OpenSim/OpenSim.Region/Scenes/ScenePresence.cs (renamed from OpenSim/OpenSim.Region/Scenes/Avatar.cs)20
-rw-r--r--OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs2
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs6
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build1
-rw-r--r--OpenSim/OpenSim/Application.cs2
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs10
24 files changed, 294 insertions, 209 deletions
diff --git a/OpenSim.build b/OpenSim.build
index dae655f..0a5efd3 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -70,7 +70,6 @@
70 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> 70 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
71 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" /> 71 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
72 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="clean" /> 72 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="clean" />
73 <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="clean" />
74 <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" /> 73 <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" />
75 </target> 74 </target>
76 75
@@ -100,7 +99,6 @@
100 <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="build" /> 99 <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="build" />
101 <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" /> 100 <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" />
102 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="build" /> 101 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="build" />
103 <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="build" />
104 </target> 102 </target>
105 103
106 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> 104 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
@@ -135,7 +133,6 @@
135 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> 133 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
136 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" /> 134 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
137 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="doc" /> 135 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="doc" />
138 <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="doc" />
139 <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" /> 136 <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" />
140 </target> 137 </target>
141 138
diff --git a/OpenSim.sln b/OpenSim.sln
index d1e89a6..36421d7 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -51,113 +51,191 @@ EndProject
51Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" 51Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
52EndProject 52EndProject
53Global 53Global
54 GlobalSection(SolutionConfigurationPlatforms) = preSolution 54 GlobalSection(SolutionConfigurationPlatforms) = preSolution
55 Debug|Any CPU = Debug|Any CPU 55 Debug|Any CPU = Debug|Any CPU
56 Release|Any CPU = Release|Any CPU 56 Release|Any CPU = Release|Any CPU
57 EndGlobalSection 57 EndGlobalSection
58 GlobalSection(ProjectConfigurationPlatforms) = postSolution 58 GlobalSection(ProjectDependencies) = postSolution
59 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 59 ({683344D5-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})
60 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 60 ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
61 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 61 ({39BD9497-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
62 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 62 ({DA9A7391-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
63 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 63 ({DA9A7391-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
64 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 64 ({DA9A7391-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
65 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 65 ({DA9A7391-0000-0000-0000-000000000000}).5 = ({E88EF749-0000-0000-0000-000000000000})
66 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 66 ({DA9A7391-0000-0000-0000-000000000000}).6 = ({8BB20F0A-0000-0000-0000-000000000000})
67 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 67 ({DA9A7391-0000-0000-0000-000000000000}).10 = ({8E81D43C-0000-0000-0000-000000000000})
68 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 68 ({438A9556-0000-0000-0000-000000000000}).3 = ({683344D5-0000-0000-0000-000000000000})
69 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 69 ({438A9556-0000-0000-0000-000000000000}).4 = ({1938EB12-0000-0000-0000-000000000000})
70 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 70 ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
71 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 71 ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
72 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 72 ({438A9556-0000-0000-0000-000000000000}).7 = ({E88EF749-0000-0000-0000-000000000000})
73 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 73 ({438A9556-0000-0000-0000-000000000000}).8 = ({79CED992-0000-0000-0000-000000000000})
74 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 74 ({438A9556-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
75 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 75 ({438A9556-0000-0000-0000-000000000000}).10 = ({196916AF-0000-0000-0000-000000000000})
76 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 76 ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})
77 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 77 ({438A9556-0000-0000-0000-000000000000}).12 = ({8BB20F0A-0000-0000-0000-000000000000})
78 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 78 ({438A9556-0000-0000-0000-000000000000}).13 = ({2270B8FE-0000-0000-0000-000000000000})
79 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 79 ({438A9556-0000-0000-0000-000000000000}).16 = ({8E81D43C-0000-0000-0000-000000000000})
80 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 80 ({1938EB12-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
81 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 81 ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
82 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 82 ({8ACA2445-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
83 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 83 ({E88EF749-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
84 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 84 ({546099CD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
85 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 85 ({546099CD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
86 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 86 ({B55C0B5D-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
87 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 87 ({B55C0B5D-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
88 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 88 ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
89 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 89 ({79CED992-0000-0000-0000-000000000000}).1 = ({683344D5-0000-0000-0000-000000000000})
90 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 90 ({79CED992-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
91 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 91 ({79CED992-0000-0000-0000-000000000000}).3 = ({DA9A7391-0000-0000-0000-000000000000})
92 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 92 ({79CED992-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
93 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 93 ({4F874463-0000-0000-0000-000000000000}).1 = ({8BE16150-0000-0000-0000-000000000000})
94 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 94 ({8BE16150-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
95 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 95 ({8BE16150-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
96 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 96 ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
97 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 97 ({988F0AC4-0000-0000-0000-000000000000}).1 = ({8BE16150-0000-0000-0000-000000000000})
98 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 98 ({196916AF-0000-0000-0000-000000000000}).3 = ({683344D5-0000-0000-0000-000000000000})
99 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 99 ({196916AF-0000-0000-0000-000000000000}).4 = ({1938EB12-0000-0000-0000-000000000000})
100 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 100 ({196916AF-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
101 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 101 ({196916AF-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
102 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 102 ({196916AF-0000-0000-0000-000000000000}).7 = ({E88EF749-0000-0000-0000-000000000000})
103 {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 103 ({196916AF-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
104 {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 104 ({196916AF-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
105 {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 105 ({196916AF-0000-0000-0000-000000000000}).10 = ({2270B8FE-0000-0000-0000-000000000000})
106 {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 106 ({196916AF-0000-0000-0000-000000000000}).13 = ({8E81D43C-0000-0000-0000-000000000000})
107 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 107 ({632E1BFD-0000-0000-0000-000000000000}).3 = ({1938EB12-0000-0000-0000-000000000000})
108 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 108 ({632E1BFD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
109 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 109 ({632E1BFD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
110 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 110 ({632E1BFD-0000-0000-0000-000000000000}).6 = ({E88EF749-0000-0000-0000-000000000000})
111 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 111 ({632E1BFD-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000})
112 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 112 ({632E1BFD-0000-0000-0000-000000000000}).8 = ({196916AF-0000-0000-0000-000000000000})
113 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 113 ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
114 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 114 ({632E1BFD-0000-0000-0000-000000000000}).10 = ({2270B8FE-0000-0000-0000-000000000000})
115 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 115 ({632E1BFD-0000-0000-0000-000000000000}).13 = ({8E81D43C-0000-0000-0000-000000000000})
116 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 116 ({8BB20F0A-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
117 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 117 ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
118 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 118 ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
119 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 119 ({EE9E5D96-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
120 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 120 ({EE9E5D96-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
121 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 121 ({E1B79ECF-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
122 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 122 ({E1B79ECF-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
123 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 123 ({6B20B603-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
124 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 124 ({6B20B603-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
125 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 125 ({24B12448-0000-0000-0000-000000000000}).1 = ({683344D5-0000-0000-0000-000000000000})
126 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 126 ({24B12448-0000-0000-0000-000000000000}).2 = ({1938EB12-0000-0000-0000-000000000000})
127 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 127 ({24B12448-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
128 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 128 ({24B12448-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
129 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 129 ({24B12448-0000-0000-0000-000000000000}).5 = ({546099CD-0000-0000-0000-000000000000})
130 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 130 ({24B12448-0000-0000-0000-000000000000}).6 = ({79CED992-0000-0000-0000-000000000000})
131 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 131 ({24B12448-0000-0000-0000-000000000000}).7 = ({196916AF-0000-0000-0000-000000000000})
132 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 132 ({24B12448-0000-0000-0000-000000000000}).8 = ({632E1BFD-0000-0000-0000-000000000000})
133 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 133 ({24B12448-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
134 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 134 ({24B12448-0000-0000-0000-000000000000}).13 = ({8E81D43C-0000-0000-0000-000000000000})
135 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 135 EndGlobalSection
136 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 136 GlobalSection(ProjectConfigurationPlatforms) = postSolution
137 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 137 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
138 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 138 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
139 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 139 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
140 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 140 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
141 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 141 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 142 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
143 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 143 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
144 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 144 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
145 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 145 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 146 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
147 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 147 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
148 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 148 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
149 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 149 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 150 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
151 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 151 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
152 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 152 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
153 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 153 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
154 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 154 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
155 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 155 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
156 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 156 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
157 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 157 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 158 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
159 EndGlobalSection 159 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
160 GlobalSection(SolutionProperties) = preSolution 160 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
161 HideSolutionNode = FALSE 161 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
162 EndGlobalSection 162 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
163 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
164 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
165 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
166 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
167 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
168 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
169 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
170 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
171 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
172 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
173 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
175 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
176 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
177 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
178 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
179 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
180 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
181 {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182 {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
183 {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
184 {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
185 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
186 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
187 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
188 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
189 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
190 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
191 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
192 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
193 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
194 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
195 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
196 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
197 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
199 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
200 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
201 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
202 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
203 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
204 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
205 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
206 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
207 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
208 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
209 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
210 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
211 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
212 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
213 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
214 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
215 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
216 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
217 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
218 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
219 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
220 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
221 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
222 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
223 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
224 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
225 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
226 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
227 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
228 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
229 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
230 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
231 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
232 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
233 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
234 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
235 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
236 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
237 EndGlobalSection
238 GlobalSection(SolutionProperties) = preSolution
239 HideSolutionNode = FALSE
240 EndGlobalSection
163EndGlobal 241EndGlobal
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs
index bc7a3b0..334b6af 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Examples/SimpleApp/MyWorld.cs
@@ -6,7 +6,7 @@ using OpenSim.Framework.Types;
6using OpenSim.Framework.Console; 6using OpenSim.Framework.Console;
7using libsecondlife; 7using libsecondlife;
8using OpenSim.Region; 8using OpenSim.Region;
9using Avatar=OpenSim.Region.Scenes.Avatar; 9using Avatar=OpenSim.Region.Scenes.ScenePresence;
10using OpenSim.Region.Scenes; 10using OpenSim.Region.Scenes;
11using OpenSim.Framework; 11using OpenSim.Framework;
12using OpenSim.Caches; 12using OpenSim.Caches;
@@ -17,7 +17,7 @@ namespace SimpleApp
17 public class MyWorld : Scene 17 public class MyWorld : Scene
18 { 18 {
19 private RegionInfo m_regionInfo; 19 private RegionInfo m_regionInfo;
20 private List<OpenSim.Region.Scenes.Avatar> m_avatars; 20 private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
21 21
22 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach) 22 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach)
23 : base(clientThreads, regionInfo, authen, commsMan, assetCach) 23 : base(clientThreads, regionInfo, authen, commsMan, assetCach)
@@ -43,7 +43,8 @@ namespace SimpleApp
43 43
44 #region IWorld Members 44 #region IWorld Members
45 45
46 override public void AddNewAvatar(IClientAPI client, LLUUID agentID, bool child) 46 override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child)
47
47 { 48 {
48 LLVector3 pos = new LLVector3(128, 128, 128); 49 LLVector3 pos = new LLVector3(128, 128, 128);
49 50
@@ -65,7 +66,7 @@ namespace SimpleApp
65 66
66 client.OnCompleteMovementToRegion += delegate() 67 client.OnCompleteMovementToRegion += delegate()
67 { 68 {
68 client.SendAvatarData(m_regionInfo, client.FirstName, 69 client.SendAvatarData(m_regionInfo.RegionHandle, client.FirstName,
69 client.LastName, client.AgentId, 0, 70 client.LastName, client.AgentId, 0,
70 pos); 71 pos);
71 72
@@ -74,7 +75,7 @@ namespace SimpleApp
74 75
75 client.SendRegionHandshake(m_regionInfo); 76 client.SendRegionHandshake(m_regionInfo);
76 77
77 OpenSim.Region.Scenes.Avatar avatar = new Avatar( client, this, m_regionInfo ); 78 OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
78 79
79 } 80 }
80 81
@@ -83,7 +84,8 @@ namespace SimpleApp
83 client.SendWearables( AvatarWearable.DefaultWearables ); 84 client.SendWearables( AvatarWearable.DefaultWearables );
84 } 85 }
85 86
86 public void RemoveAvatar(LLUUID agentID) 87
88 override public void RemoveClient(LLUUID agentID)
87 { 89 {
88 90
89 } 91 }
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index b0b68d9..6d89cbe 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -19,13 +19,13 @@ namespace SimpleApp
19{ 19{
20 class Program : IAssetReceiver, conscmd_callback 20 class Program : IAssetReceiver, conscmd_callback
21 { 21 {
22 private ConsoleBase m_console; 22 private LogBase m_console;
23 AuthenticateSessionsBase m_circuitManager; 23 AuthenticateSessionsBase m_circuitManager;
24 24
25 private void Run() 25 private void Run()
26 { 26 {
27 m_console = new ConsoleBase(null, "SimpleApp", this, false); 27 m_console = new LogBase(null, "SimpleApp", this, false);
28 MainConsole.Instance = m_console; 28 MainLog.Instance = m_console;
29 29
30 CheckSumServer checksumServer = new CheckSumServer(12036); 30 CheckSumServer checksumServer = new CheckSumServer(12036);
31 checksumServer.ServerListener(); 31 checksumServer.ServerListener();
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
index b024219..087922b 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
@@ -21,13 +21,15 @@
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="../../../bin/libsecondlife.dll" /> 23 <include name="../../../bin/libsecondlife.dll" />
24 <include name="../../../bin/OpenGrid.Framework.Communications.dll" />
24 <include name="../../../bin/OpenSim.Caches.dll" /> 25 <include name="../../../bin/OpenSim.Caches.dll" />
25 <include name="../../../bin/OpenSim.Framework.dll" /> 26 <include name="../../../bin/OpenSim.Framework.dll" />
26 <include name="../../../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../../../bin/OpenSim.Framework.Console.dll" />
27 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" /> 28 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />
29 <include name="../../../bin/OpenSim.LocalCommunications.dll" />
30 <include name="../../../bin/OpenSim.Region.dll" />
28 <include name="../../../bin/OpenSim.RegionServer.dll" /> 31 <include name="../../../bin/OpenSim.RegionServer.dll" />
29 <include name="../../../bin/OpenSim.Servers.dll" /> 32 <include name="../../../bin/OpenSim.Servers.dll" />
30 <include name="OpenSim.World.dll" />
31 <include name="System.dll" /> 33 <include name="System.dll" />
32 <include name="System.Data.dll.dll" /> 34 <include name="System.Data.dll.dll" />
33 <include name="System.Xml.dll" /> 35 <include name="System.Xml.dll" />
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
index 0fe52a7..fdfdd16 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
@@ -38,6 +38,6 @@ namespace OpenSim.LocalCommunications
38 { 38 {
39 39
40 } 40 }
41 41
42 } 42 }
43} 43}
diff --git a/OpenSim/OpenSim.Region/EstateManager.cs b/OpenSim/OpenSim.Region/EstateManager.cs
index 3b918b1..fbcab33 100644
--- a/OpenSim/OpenSim.Region/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/EstateManager.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.Scenes;
35using OpenSim; 35using OpenSim;
36using libsecondlife; 36using libsecondlife;
37using libsecondlife.Packets; 37using libsecondlife.Packets;
38using Avatar = OpenSim.Region.Scenes.Avatar; 38using Avatar = OpenSim.Region.Scenes.ScenePresence;
39 39
40 40
41namespace OpenSim.Region 41namespace OpenSim.Region
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 94efbed..a531e5c 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -142,15 +142,6 @@
142 <Compile Include="ParcelManager.cs"> 142 <Compile Include="ParcelManager.cs">
143 <SubType>Code</SubType> 143 <SubType>Code</SubType>
144 </Compile> 144 </Compile>
145 <Compile Include="Scenes\Avatar.Animations.cs">
146 <SubType>Code</SubType>
147 </Compile>
148 <Compile Include="Scenes\Avatar.cs">
149 <SubType>Code</SubType>
150 </Compile>
151 <Compile Include="Scenes\Avatar.Update.cs">
152 <SubType>Code</SubType>
153 </Compile>
154 <Compile Include="Scenes\Entity.cs"> 145 <Compile Include="Scenes\Entity.cs">
155 <SubType>Code</SubType> 146 <SubType>Code</SubType>
156 </Compile> 147 </Compile>
@@ -172,6 +163,15 @@
172 <Compile Include="Scenes\SceneObject.cs"> 163 <Compile Include="Scenes\SceneObject.cs">
173 <SubType>Code</SubType> 164 <SubType>Code</SubType>
174 </Compile> 165 </Compile>
166 <Compile Include="Scenes\ScenePresence.Animations.cs">
167 <SubType>Code</SubType>
168 </Compile>
169 <Compile Include="Scenes\ScenePresence.cs">
170 <SubType>Code</SubType>
171 </Compile>
172 <Compile Include="Scenes\ScenePresence.Update.cs">
173 <SubType>Code</SubType>
174 </Compile>
175 <Compile Include="Scenes\scripting\IScriptContext.cs"> 175 <Compile Include="Scenes\scripting\IScriptContext.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index 6d47576..e277ec7 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,9 +13,6 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="EstateManager.cs" /> 14 <include name="EstateManager.cs" />
15 <include name="ParcelManager.cs" /> 15 <include name="ParcelManager.cs" />
16 <include name="Scenes/Avatar.Animations.cs" />
17 <include name="Scenes/Avatar.cs" />
18 <include name="Scenes/Avatar.Update.cs" />
19 <include name="Scenes/Entity.cs" /> 16 <include name="Scenes/Entity.cs" />
20 <include name="Scenes/Primitive.cs" /> 17 <include name="Scenes/Primitive.cs" />
21 <include name="Scenes/Scene.cs" /> 18 <include name="Scenes/Scene.cs" />
@@ -23,6 +20,9 @@
23 <include name="Scenes/Scene.Scripting.cs" /> 20 <include name="Scenes/Scene.Scripting.cs" />
24 <include name="Scenes/SceneBase.cs" /> 21 <include name="Scenes/SceneBase.cs" />
25 <include name="Scenes/SceneObject.cs" /> 22 <include name="Scenes/SceneObject.cs" />
23 <include name="Scenes/ScenePresence.Animations.cs" />
24 <include name="Scenes/ScenePresence.cs" />
25 <include name="Scenes/ScenePresence.Update.cs" />
26 <include name="Scenes/scripting/IScriptContext.cs" /> 26 <include name="Scenes/scripting/IScriptContext.cs" />
27 <include name="Scenes/scripting/IScriptEntity.cs" /> 27 <include name="Scenes/scripting/IScriptEntity.cs" />
28 <include name="Scenes/scripting/IScriptHandler.cs" /> 28 <include name="Scenes/scripting/IScriptHandler.cs" />
diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/OpenSim.Region/ParcelManager.cs
index 3b0785f..d15d77d 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/OpenSim.Region/ParcelManager.cs
@@ -33,7 +33,7 @@ using libsecondlife.Packets;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
35using OpenSim.Region.Scenes; 35using OpenSim.Region.Scenes;
36using Avatar = OpenSim.Region.Scenes.Avatar; 36using Avatar = OpenSim.Region.Scenes.ScenePresence;
37 37
38namespace OpenSim.Region 38namespace OpenSim.Region
39{ 39{
diff --git a/OpenSim/OpenSim.Region/Scenes/Primitive.cs b/OpenSim/OpenSim.Region/Scenes/Primitive.cs
index 929f0b5..39b3fbc 100644
--- a/OpenSim/OpenSim.Region/Scenes/Primitive.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Primitive.cs
@@ -419,7 +419,7 @@ namespace OpenSim.Region.Scenes
419 /// </summary> 419 /// </summary>
420 public void SendFullUpdateToAllClients() 420 public void SendFullUpdateToAllClients()
421 { 421 {
422 List<Avatar> avatars = this.m_world.RequestAvatarList(); 422 List<ScenePresence> avatars = this.m_world.RequestAvatarList();
423 for (int i = 0; i < avatars.Count; i++) 423 for (int i = 0; i < avatars.Count; i++)
424 { 424 {
425 this.SendFullUpdateToClient(avatars[i].ControllingClient); 425 this.SendFullUpdateToClient(avatars[i].ControllingClient);
@@ -452,7 +452,7 @@ namespace OpenSim.Region.Scenes
452 /// </summary> 452 /// </summary>
453 public void SendTerseUpdateToALLClients() 453 public void SendTerseUpdateToALLClients()
454 { 454 {
455 List<Avatar> avatars = this.m_world.RequestAvatarList(); 455 List<ScenePresence> avatars = this.m_world.RequestAvatarList();
456 for (int i = 0; i < avatars.Count; i++) 456 for (int i = 0; i < avatars.Count; i++)
457 { 457 {
458 this.SendTerseUpdateToClient(avatars[i].ControllingClient); 458 this.SendTerseUpdateToClient(avatars[i].ControllingClient);
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
index 35a3bda..75fe779 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Scenes
75 public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) 75 public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
76 { 76 {
77 Console.WriteLine("Chat message"); 77 Console.WriteLine("Chat message");
78 Avatar avatar = null; 78 ScenePresence avatar = null;
79 foreach (IClientAPI client in m_clientThreads.Values) 79 foreach (IClientAPI client in m_clientThreads.Values)
80 { 80 {
81 int dis = -1000; 81 int dis = -1000;
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs b/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
index 6317e43..7b53388 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Scenes
169 uint res = 0; 169 uint res = 0;
170 foreach (Entity entity in this.Entities.Values) 170 foreach (Entity entity in this.Entities.Values)
171 { 171 {
172 if (entity is Avatar) 172 if (entity is ScenePresence)
173 { 173 {
174 res = entity.LocalId; 174 res = entity.LocalId;
175 } 175 }
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index ffcc0c8..74b4945 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -46,12 +46,12 @@ using OpenSim.Caches;
46 46
47namespace OpenSim.Region.Scenes 47namespace OpenSim.Region.Scenes
48{ 48{
49 public delegate bool FilterAvatarList(Avatar avatar); 49 public delegate bool FilterAvatarList(ScenePresence avatar);
50 50
51 public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI 51 public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
52 { 52 {
53 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); 53 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
54 protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars; 54 protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;
55 protected Dictionary<libsecondlife.LLUUID, Primitive> Prims; 55 protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;
56 private PhysicsScene phyScene; 56 private PhysicsScene phyScene;
57 private float timeStep = 0.1f; 57 private float timeStep = 0.1f;
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
66 protected AuthenticateSessionsBase authenticateHandler; 66 protected AuthenticateSessionsBase authenticateHandler;
67 protected RegionCommsListener regionCommsHost; 67 protected RegionCommsListener regionCommsHost;
68 protected CommunicationsManager commsManager; 68 protected CommunicationsManager commsManager;
69 69
70 70
71 public ParcelManager parcelManager; 71 public ParcelManager parcelManager;
72 public EstateManager estateManager; 72 public EstateManager estateManager;
@@ -119,14 +119,14 @@ namespace OpenSim.Region.Scenes
119 119
120 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance"); 120 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
121 Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); 121 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
122 Avatars = new Dictionary<LLUUID, Avatar>(); 122 Avatars = new Dictionary<LLUUID, ScenePresence>();
123 Prims = new Dictionary<LLUUID, Primitive>(); 123 Prims = new Dictionary<LLUUID, Primitive>();
124 124
125 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap"); 125 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
126 TerrainManager = new TerrainManager(new SecondLife()); 126 TerrainManager = new TerrainManager(new SecondLife());
127 Terrain = new TerrainEngine(); 127 Terrain = new TerrainEngine();
128 128
129 Avatar.LoadAnims(); 129 ScenePresence.LoadAnims();
130 } 130 }
131 catch (Exception e) 131 catch (Exception e)
132 { 132 {
@@ -209,7 +209,7 @@ namespace OpenSim.Region.Scenes
209 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString()); 209 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
210 } 210 }
211 updateLock.ReleaseMutex(); 211 updateLock.ReleaseMutex();
212 212
213 } 213 }
214 214
215 /// <summary> 215 /// <summary>
@@ -408,6 +408,7 @@ namespace OpenSim.Region.Scenes
408 /// <summary> 408 /// <summary>
409 /// Loads the World heightmap 409 /// Loads the World heightmap
410 /// </summary> 410 /// </summary>
411 ///
411 public override void LoadWorldMap() 412 public override void LoadWorldMap()
412 { 413 {
413 try 414 try
@@ -415,16 +416,16 @@ namespace OpenSim.Region.Scenes
415 float[] map = this.localStorage.LoadWorld(); 416 float[] map = this.localStorage.LoadWorld();
416 if (map == null) 417 if (map == null)
417 { 418 {
418 // Console.WriteLine("creating new terrain"); 419 // Console.WriteLine("creating new terrain");
419 // this.Terrain.hills(); 420 // this.Terrain.hills();
420 421
421 // this.localStorage.SaveMap(this.Terrain.getHeights1D()); 422 // this.localStorage.SaveMap(this.Terrain.getHeights1D());
422 if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile)) 423 if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
423 { 424 {
424 Console.WriteLine("No default terrain, procedurally generating..."); 425 Console.WriteLine("No default terrain, procedurally generating...");
425 this.Terrain.hills(); 426 this.Terrain.hills();
426 427
427 // this.localStorage.SaveMap(this.Terrain.getHeights1D()); 428 // this.localStorage.SaveMap(this.Terrain.getHeights1D());
428 } 429 }
429 else 430 else
430 { 431 {
@@ -438,7 +439,7 @@ namespace OpenSim.Region.Scenes
438 Console.WriteLine("Unable to load default terrain, procedurally generating instead..."); 439 Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
439 Terrain.hills(); 440 Terrain.hills();
440 } 441 }
441 // this.localStorage.SaveMap(this.Terrain.getHeights1D()); 442 // this.localStorage.SaveMap(this.Terrain.getHeights1D());
442 } 443 }
443 } 444 }
444 else 445 else
@@ -447,7 +448,7 @@ namespace OpenSim.Region.Scenes
447 } 448 }
448 449
449 CreateTerrainTexture(); 450 CreateTerrainTexture();
450 451
451 } 452 }
452 catch (Exception e) 453 catch (Exception e)
453 { 454 {
@@ -455,7 +456,6 @@ namespace OpenSim.Region.Scenes
455 } 456 }
456 } 457 }
457 458
458
459 /// <summary> 459 /// <summary>
460 /// 460 ///
461 /// </summary> 461 /// </summary>
@@ -520,15 +520,19 @@ namespace OpenSim.Region.Scenes
520 { 520 {
521 try 521 try
522 { 522 {
523
523 // MainLog.Instance.Notice("World.cs: AddNewPrim() - Creating new prim"); 524 // MainLog.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
525
524 Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount); 526 Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
525 527
526 this.Entities.Add(prim.uuid, prim); 528 this.Entities.Add(prim.uuid, prim);
527 this._primCount++; 529 this._primCount++;
528 } 530 }
529 catch (Exception e) 531 catch (Exception e)
530 { 532 {
533
531 // MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString()); 534 // MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
535
532 } 536 }
533 } 537 }
534 538
@@ -542,16 +546,16 @@ namespace OpenSim.Region.Scenes
542 /// <param name="remoteClient"></param 546 /// <param name="remoteClient"></param
543 /// <param name="agentID"></param> 547 /// <param name="agentID"></param>
544 /// <param name="child"></param> 548 /// <param name="child"></param>
545 public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child) 549 public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)
546 { 550 {
547 remoteClient.OnRegionHandShakeReply += new GenericCall(this.SendLayerData); 551 remoteClient.OnRegionHandShakeReply += this.SendLayerData;
548 //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); 552 //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
549 remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat); 553 remoteClient.OnChatFromViewer += this.SimChat;
550 remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours); 554 remoteClient.OnRequestWearables += this.InformClientOfNeighbours;
551 remoteClient.OnAddPrim += new GenericCall4(this.AddNewPrim); 555 remoteClient.OnAddPrim += this.AddNewPrim;
552 remoteClient.OnUpdatePrimPosition += new UpdatePrimVector(this.UpdatePrimPosition); 556 remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;
553 remoteClient.OnRequestMapBlocks += new RequestMapBlocks(this.RequestMapBlocks); 557 remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;
554 remoteClient.OnTeleportLocationRequest += new TeleportLocationRequest(this.RequestTeleportLocation); 558 remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
555 559
556 /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); 560 /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
557 remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); 561 remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@@ -560,11 +564,12 @@ namespace OpenSim.Region.Scenes
560 remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 564 remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
561 */ 565 */
562 566
563 Avatar newAvatar = null; 567 ScenePresence newAvatar = null;
564 try 568 try
565 { 569 {
570
566 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); 571 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
567 newAvatar = new Avatar(remoteClient, this, this.m_regInfo); 572 newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);
568 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world"); 573 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
569 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake "); 574 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
570 575
@@ -607,13 +612,13 @@ namespace OpenSim.Region.Scenes
607 return; 612 return;
608 } 613 }
609 614
610 615
611 616
612 /// <summary> 617 /// <summary>
613 /// 618 ///
614 /// </summary> 619 /// </summary>
615 /// <param name="agentID"></param> 620 /// <param name="agentID"></param>
616 public override void RemoveAvatar(LLUUID agentID) 621 public override void RemoveClient(LLUUID agentID)
617 { 622 {
618 return; 623 return;
619 } 624 }
@@ -627,11 +632,11 @@ namespace OpenSim.Region.Scenes
627 /// Request a List of all Avatars in this World 632 /// Request a List of all Avatars in this World
628 /// </summary> 633 /// </summary>
629 /// <returns></returns> 634 /// <returns></returns>
630 public List<Avatar> RequestAvatarList() 635 public List<ScenePresence> RequestAvatarList()
631 { 636 {
632 List<Avatar> result = new List<Avatar>(); 637 List<ScenePresence> result = new List<ScenePresence>();
633 638
634 foreach (Avatar avatar in Avatars.Values) 639 foreach (ScenePresence avatar in Avatars.Values)
635 { 640 {
636 result.Add(avatar); 641 result.Add(avatar);
637 } 642 }
@@ -643,11 +648,11 @@ namespace OpenSim.Region.Scenes
643 /// Request a filtered list of Avatars in this World 648 /// Request a filtered list of Avatars in this World
644 /// </summary> 649 /// </summary>
645 /// <returns></returns> 650 /// <returns></returns>
646 public List<Avatar> RequestAvatarList(FilterAvatarList filter) 651 public List<ScenePresence> RequestAvatarList(FilterAvatarList filter)
647 { 652 {
648 List<Avatar> result = new List<Avatar>(); 653 List<ScenePresence> result = new List<ScenePresence>();
649 654
650 foreach (Avatar avatar in Avatars.Values) 655 foreach (ScenePresence avatar in Avatars.Values)
651 { 656 {
652 if (filter(avatar)) 657 if (filter(avatar))
653 { 658 {
@@ -663,7 +668,7 @@ namespace OpenSim.Region.Scenes
663 /// </summary> 668 /// </summary>
664 /// <param name="avatarID"></param> 669 /// <param name="avatarID"></param>
665 /// <returns></returns> 670 /// <returns></returns>
666 public Avatar RequestAvatar(LLUUID avatarID) 671 public ScenePresence RequestAvatar(LLUUID avatarID)
667 { 672 {
668 if (this.Avatars.ContainsKey(avatarID)) 673 if (this.Avatars.ContainsKey(avatarID))
669 { 674 {
@@ -712,7 +717,7 @@ namespace OpenSim.Region.Scenes
712 /// <param name="agent"></param> 717 /// <param name="agent"></param>
713 public void NewUserConnection(ulong regionHandle, AgentCircuitData agent) 718 public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
714 { 719 {
715 // Console.WriteLine("World.cs - add new user connection"); 720 // Console.WriteLine("World.cs - add new user connection");
716 //should just check that its meant for this region 721 //should just check that its meant for this region
717 if (regionHandle == this.m_regInfo.RegionHandle) 722 if (regionHandle == this.m_regInfo.RegionHandle)
718 { 723 {
@@ -777,7 +782,7 @@ namespace OpenSim.Region.Scenes
777 { 782 {
778 List<MapBlockData> mapBlocks; 783 List<MapBlockData> mapBlocks;
779 mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY); 784 mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
780 785
781 remoteClient.SendMapBlock(mapBlocks); 786 remoteClient.SendMapBlock(mapBlocks);
782 } 787 }
783 788
diff --git a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs b/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
index 05c2aba..e650127 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
+++ b/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
@@ -43,7 +43,7 @@ using OpenSim.Caches;
43 43
44namespace OpenSim.Region.Scenes 44namespace OpenSim.Region.Scenes
45{ 45{
46 public abstract class SceneBase : IWorld 46 public abstract class SceneBase : IWorld
47 { 47 {
48 public Dictionary<libsecondlife.LLUUID, Entity> Entities; 48 public Dictionary<libsecondlife.LLUUID, Entity> Entities;
49 protected Dictionary<uint, IClientAPI> m_clientThreads; 49 protected Dictionary<uint, IClientAPI> m_clientThreads;
@@ -98,13 +98,13 @@ namespace OpenSim.Region.Scenes
98 /// <param name="remoteClient"></param> 98 /// <param name="remoteClient"></param>
99 /// <param name="agentID"></param> 99 /// <param name="agentID"></param>
100 /// <param name="child"></param> 100 /// <param name="child"></param>
101 public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child); 101 public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
102 102
103 /// <summary> 103 /// <summary>
104 /// 104 ///
105 /// </summary> 105 /// </summary>
106 /// <param name="agentID"></param> 106 /// <param name="agentID"></param>
107 public abstract void RemoveAvatar(LLUUID agentID); 107 public abstract void RemoveClient(LLUUID agentID);
108 108
109 #endregion 109 #endregion
110 110
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs
index cc0fb7a..f0a8721 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs
@@ -33,7 +33,7 @@ using System.Xml;
33 33
34namespace OpenSim.Region.Scenes 34namespace OpenSim.Region.Scenes
35{ 35{
36 partial class Avatar 36 partial class ScenePresence
37 { 37 {
38 public class AvatarAnimations 38 public class AvatarAnimations
39 { 39 {
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
66 66
67 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 67 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
68 68
69 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.Avatar.Animations.AnimsLLUUID) 69 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)
70 { 70 {
71 AnimsNames.Add(kp.Value, kp.Key); 71 AnimsNames.Add(kp.Value, kp.Key);
72 } 72 }
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs
index 8b27efe..3885c0d 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
36 36
37namespace OpenSim.Region.Scenes 37namespace OpenSim.Region.Scenes
38{ 38{
39 partial class Avatar 39 partial class ScenePresence
40 { 40 {
41 /// <summary> 41 /// <summary>
42 /// 42 ///
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Scenes
68 /// 68 ///
69 /// </summary> 69 /// </summary>
70 /// <param name="remoteAvatar"></param> 70 /// <param name="remoteAvatar"></param>
71 public void SendUpdateToOtherClient(Avatar remoteAvatar) 71 public void SendUpdateToOtherClient(ScenePresence remoteAvatar)
72 { 72 {
73 73
74 } 74 }
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Scenes
87 /// </summary> 87 /// </summary>
88 public void SendInitialPosition() 88 public void SendInitialPosition()
89 { 89 {
90 this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos); 90 this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);
91 } 91 }
92 92
93 /// <summary> 93 /// <summary>
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Scenes
111 /// 111 ///
112 /// </summary> 112 /// </summary>
113 /// <param name="avatarInfo"></param> 113 /// <param name="avatarInfo"></param>
114 public void SendAppearanceToOtherAgent(Avatar avatarInfo) 114 public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
115 { 115 {
116 116
117 } 117 }
@@ -161,7 +161,7 @@ namespace OpenSim.Region.Scenes
161 LLVector3 pos2 = this.Pos; 161 LLVector3 pos2 = this.Pos;
162 LLVector3 vel = this.Velocity; 162 LLVector3 vel = this.Velocity;
163 163
164 float timeStep = 0.3f; 164 float timeStep = 0.2f;
165 pos2.X = pos2.X + (vel.X * timeStep); 165 pos2.X = pos2.X + (vel.X * timeStep);
166 pos2.Y = pos2.Y + (vel.Y * timeStep); 166 pos2.Y = pos2.Y + (vel.Y * timeStep);
167 pos2.Z = pos2.Z + (vel.Z * timeStep); 167 pos2.Z = pos2.Z + (vel.Z * timeStep);
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
index 1149896..3fbda39 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
@@ -39,7 +39,7 @@ using Axiom.MathLib;
39 39
40namespace OpenSim.Region.Scenes 40namespace OpenSim.Region.Scenes
41{ 41{
42 public partial class Avatar : Entity 42 public partial class ScenePresence : Entity
43 { 43 {
44 public static bool PhysicsEngineFlying = false; 44 public static bool PhysicsEngineFlying = false;
45 public static AvatarAnimations Animations; 45 public static AvatarAnimations Animations;
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Scenes
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, Scene world, RegionInfo reginfo) 73 public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo)
74 { 74 {
75 75
76 m_world = world; 76 m_world = world;
@@ -93,15 +93,15 @@ namespace OpenSim.Region.Scenes
93 Wearables = AvatarWearable.DefaultWearables; 93 Wearables = AvatarWearable.DefaultWearables;
94 94
95 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); 95 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
96 96
97 //register for events 97 //register for events
98 ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance); 98 ControllingClient.OnRequestWearables += this.SendOurAppearance;
99 //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance); 99 //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
100 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement); 100 ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;
101 ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition); 101 ControllingClient.OnCompleteMovementToRegion += this.SendInitialPosition;
102 ControllingClient.OnAgentUpdate += new UpdateAgent(this.HandleAgentUpdate); 102 ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;
103 // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack); 103 // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
104 // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange); 104 // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
105 //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement); 105 //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
106 106
107 } 107 }
@@ -202,7 +202,7 @@ namespace OpenSim.Region.Scenes
202 /// </summary> 202 /// </summary>
203 public void SendTerseUpdateToALLClients() 203 public void SendTerseUpdateToALLClients()
204 { 204 {
205 List<Avatar> avatars = this.m_world.RequestAvatarList(); 205 List<ScenePresence> avatars = this.m_world.RequestAvatarList();
206 for (int i = 0; i < avatars.Count; i++) 206 for (int i = 0; i < avatars.Count; i++)
207 { 207 {
208 this.SendTerseUpdateToClient(avatars[i].ControllingClient); 208 this.SendTerseUpdateToClient(avatars[i].ControllingClient);
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs b/OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs
index 581ad43..797998d 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs
+++ b/OpenSim/OpenSim.Region/Scenes/scripting/IScriptHandler.cs
@@ -32,7 +32,7 @@ using libsecondlife;
32using OpenSim.Physics.Manager; 32using OpenSim.Physics.Manager;
33using OpenSim.Region; 33using OpenSim.Region;
34using OpenSim.Region.Scenes; 34using OpenSim.Region.Scenes;
35using Avatar=OpenSim.Region.Scenes.Avatar; 35using Avatar=OpenSim.Region.Scenes.ScenePresence;
36using Primitive = OpenSim.Region.Scenes.Primitive; 36using Primitive = OpenSim.Region.Scenes.Primitive;
37 37
38namespace OpenSim.Region.Scripting 38namespace OpenSim.Region.Scripting
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index ee6d741..1895fb9 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -483,13 +483,13 @@ namespace OpenSim
483 /// <param name="avatarID"></param> 483 /// <param name="avatarID"></param>
484 /// <param name="avatarLocalID"></param> 484 /// <param name="avatarLocalID"></param>
485 /// <param name="Pos"></param> 485 /// <param name="Pos"></param>
486 public void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos) 486 public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos)
487 { 487 {
488 System.Text.Encoding _enc = System.Text.Encoding.ASCII; 488 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
489 //send a objectupdate packet with information about the clients avatar 489 //send a objectupdate packet with information about the clients avatar
490 490
491 ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); 491 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
492 objupdate.RegionData.RegionHandle = regionInfo.RegionHandle; 492 objupdate.RegionData.RegionHandle = regionHandle;
493 objupdate.RegionData.TimeDilation = 64096; 493 objupdate.RegionData.TimeDilation = 64096;
494 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; 494 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
495 objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(); 495 objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket();
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index b089bdc..5d15ae3 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -71,7 +71,7 @@ namespace OpenSim
71 71
72 private AgentAssetUpload UploadAssets; 72 private AgentAssetUpload UploadAssets;
73 private LLUUID newAssetFolder = LLUUID.Zero; 73 private LLUUID newAssetFolder = LLUUID.Zero;
74 private bool debug = false; 74 private bool debug = true;
75 protected IWorld m_world; 75 protected IWorld m_world;
76 private Dictionary<uint, ClientView> m_clientThreads; 76 private Dictionary<uint, ClientView> m_clientThreads;
77 private AssetCache m_assetCache; 77 private AssetCache m_assetCache;
@@ -124,7 +124,7 @@ namespace OpenSim
124 } 124 }
125 125
126 this.m_inventoryCache.ClientLeaving(this.AgentID, null); 126 this.m_inventoryCache.ClientLeaving(this.AgentID, null);
127 m_world.RemoveAvatar(this.AgentId); 127 m_world.RemoveClient(this.AgentId);
128 128
129 m_clientThreads.Remove(this.CircuitCode); 129 m_clientThreads.Remove(this.CircuitCode);
130 m_networkServer.RemoveClientCircuit(this.CircuitCode); 130 m_networkServer.RemoveClientCircuit(this.CircuitCode);
@@ -211,7 +211,7 @@ namespace OpenSim
211 protected virtual void InitNewClient() 211 protected virtual void InitNewClient()
212 { 212 {
213 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); 213 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
214 this.m_world.AddNewAvatar(this, this.AgentID, false); 214 this.m_world.AddNewClient(this, this.AgentID, false);
215 } 215 }
216 216
217 protected virtual void AuthUser() 217 protected virtual void AuthUser()
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 23eca3a..520f826 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -38,6 +38,7 @@
38 <include name="../../bin/OpenSim.Framework.Console.dll" /> 38 <include name="../../bin/OpenSim.Framework.Console.dll" />
39 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> 39 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
40 <include name="../../bin/OpenSim.Physics.Manager.dll" /> 40 <include name="../../bin/OpenSim.Physics.Manager.dll" />
41 <include name="../../bin/OpenSim.Region.dll" />
41 <include name="../../bin/OpenSim.Servers.dll" /> 42 <include name="../../bin/OpenSim.Servers.dll" />
42 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" /> 43 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
43 <include name="System.dll" /> 44 <include name="System.dll" />
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
index 804d46a..7254560 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/OpenSim/Application.cs
@@ -109,7 +109,7 @@ namespace OpenSim
109 sim.m_sandbox = sandBoxMode; 109 sim.m_sandbox = sandBoxMode;
110 sim.user_accounts = userAccounts; 110 sim.user_accounts = userAccounts;
111 sim.gridLocalAsset = gridLocalAsset; 111 sim.gridLocalAsset = gridLocalAsset;
112 OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = allowFlying; 112 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
113 113
114 sim.StartUp(); 114 sim.StartUp();
115 115
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index d6fbb11..0ef6cbd 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -362,23 +362,23 @@ namespace OpenSim
362 case "": 362 case "":
363 this.m_physicsEngine = "basicphysics"; 363 this.m_physicsEngine = "basicphysics";
364 configData.SetAttribute("PhysicsEngine", "basicphysics"); 364 configData.SetAttribute("PhysicsEngine", "basicphysics");
365 OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = false; 365 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
366 break; 366 break;
367 367
368 case "basicphysics": 368 case "basicphysics":
369 this.m_physicsEngine = "basicphysics"; 369 this.m_physicsEngine = "basicphysics";
370 configData.SetAttribute("PhysicsEngine", "basicphysics"); 370 configData.SetAttribute("PhysicsEngine", "basicphysics");
371 OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = false; 371 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
372 break; 372 break;
373 373
374 case "RealPhysX": 374 case "RealPhysX":
375 this.m_physicsEngine = "RealPhysX"; 375 this.m_physicsEngine = "RealPhysX";
376 OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = true; 376 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
377 break; 377 break;
378 378
379 case "OpenDynamicsEngine": 379 case "OpenDynamicsEngine":
380 this.m_physicsEngine = "OpenDynamicsEngine"; 380 this.m_physicsEngine = "OpenDynamicsEngine";
381 OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = true; 381 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
382 break; 382 break;
383 } 383 }
384 384
@@ -457,7 +457,7 @@ namespace OpenSim
457 m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); 457 m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
458 break; 458 break;
459 case "users": 459 case "users":
460 OpenSim.Region.Scenes.Avatar TempAv; 460 OpenSim.Region.Scenes.ScenePresence TempAv;
461 m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); 461 m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
462 /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) 462 /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
463 { 463 {
generated by cgit v1.1 at 2024-11-05 13:31:54 +0000