diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs | 7 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | 51 |
2 files changed, 26 insertions, 32 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs index b86d9e8..c6749a1 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim | |||
81 | } | 81 | } |
82 | break; | 82 | break; |
83 | 83 | ||
84 | #region New Event System - World/Avatar | 84 | #region World/Avatar |
85 | case PacketType.ChatFromViewer: | 85 | case PacketType.ChatFromViewer: |
86 | ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; | 86 | ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; |
87 | if (Util.FieldToString(inchatpack.ChatData.Message) == "") | 87 | if (Util.FieldToString(inchatpack.ChatData.Message) == "") |
@@ -163,7 +163,7 @@ namespace OpenSim | |||
163 | { | 163 | { |
164 | OnCompleteMovementToRegion(); | 164 | OnCompleteMovementToRegion(); |
165 | } | 165 | } |
166 | this.EnableNeighbours(); | 166 | // this.EnableNeighbours(); |
167 | break; | 167 | break; |
168 | case PacketType.AgentUpdate: | 168 | case PacketType.AgentUpdate: |
169 | if (OnAgentUpdate != null) | 169 | if (OnAgentUpdate != null) |
@@ -190,7 +190,7 @@ namespace OpenSim | |||
190 | 190 | ||
191 | #endregion | 191 | #endregion |
192 | 192 | ||
193 | #region New Event System - Objects/Prims | 193 | #region Objects/Prims |
194 | case PacketType.ObjectLink: | 194 | case PacketType.ObjectLink: |
195 | // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); | 195 | // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); |
196 | ObjectLinkPacket link = (ObjectLinkPacket)Pack; | 196 | ObjectLinkPacket link = (ObjectLinkPacket)Pack; |
@@ -521,6 +521,7 @@ namespace OpenSim | |||
521 | } | 521 | } |
522 | break; | 522 | break; |
523 | #endregion | 523 | #endregion |
524 | |||
524 | #region unimplemented handlers | 525 | #region unimplemented handlers |
525 | case PacketType.AgentIsNowWearing: | 526 | case PacketType.AgentIsNowWearing: |
526 | // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; | 527 | // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 3e6c1ea..c71e60c 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenSim.RegionServer</AssemblyName> | 12 | <AssemblyName>OpenSim.RegionServer</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.RegionServer</RootNamespace> | 19 | <RootNamespace>OpenSim.RegionServer</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,27 +55,26 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="libsecondlife.dll"> | 69 | <Reference Include="libsecondlife.dll" > |
77 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="Axiom.MathLib.dll"> | 73 | <Reference Include="Axiom.MathLib.dll" > |
81 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 74 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="Db4objects.Db4o.dll"> | 77 | <Reference Include="Db4objects.Db4o.dll" > |
85 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </Reference> | 80 | </Reference> |
@@ -91,49 +84,49 @@ | |||
91 | <Name>OpenSim.Terrain.BasicTerrain</Name> | 84 | <Name>OpenSim.Terrain.BasicTerrain</Name> |
92 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> | 85 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> |
93 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
94 | <Private>False</Private> | 87 | <Private>False</Private> |
95 | </ProjectReference> | 88 | </ProjectReference> |
96 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
97 | <Name>OpenSim.Framework</Name> | 90 | <Name>OpenSim.Framework</Name> |
98 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 91 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
99 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
100 | <Private>False</Private> | 93 | <Private>False</Private> |
101 | </ProjectReference> | 94 | </ProjectReference> |
102 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 95 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
103 | <Name>OpenSim.Framework.Console</Name> | 96 | <Name>OpenSim.Framework.Console</Name> |
104 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 97 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
105 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
106 | <Private>False</Private> | 99 | <Private>False</Private> |
107 | </ProjectReference> | 100 | </ProjectReference> |
108 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> | 101 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> |
109 | <Name>OpenSim.GenericConfig.Xml</Name> | 102 | <Name>OpenSim.GenericConfig.Xml</Name> |
110 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> | 103 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> |
111 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
112 | <Private>False</Private> | 105 | <Private>False</Private> |
113 | </ProjectReference> | 106 | </ProjectReference> |
114 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 107 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
115 | <Name>OpenSim.Physics.Manager</Name> | 108 | <Name>OpenSim.Physics.Manager</Name> |
116 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 109 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> |
117 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
118 | <Private>False</Private> | 111 | <Private>False</Private> |
119 | </ProjectReference> | 112 | </ProjectReference> |
120 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> | 113 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> |
121 | <Name>OpenSim.Servers</Name> | 114 | <Name>OpenSim.Servers</Name> |
122 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 115 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> |
123 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
124 | <Private>False</Private> | 117 | <Private>False</Private> |
125 | </ProjectReference> | 118 | </ProjectReference> |
126 | <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj"> | 119 | <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj"> |
127 | <Name>OpenSim.Caches</Name> | 120 | <Name>OpenSim.Caches</Name> |
128 | <Project>{1938EB12-0000-0000-0000-000000000000}</Project> | 121 | <Project>{1938EB12-0000-0000-0000-000000000000}</Project> |
129 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
130 | <Private>False</Private> | 123 | <Private>False</Private> |
131 | </ProjectReference> | 124 | </ProjectReference> |
132 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> | 125 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> |
133 | <Name>XMLRPC</Name> | 126 | <Name>XMLRPC</Name> |
134 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 127 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
135 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 128 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
136 | <Private>False</Private> | 129 | <Private>False</Private> |
137 | </ProjectReference> | 130 | </ProjectReference> |
138 | </ItemGroup> | 131 | </ItemGroup> |
139 | <ItemGroup> | 132 | <ItemGroup> |
@@ -187,4 +180,4 @@ | |||
187 | <PostBuildEvent> | 180 | <PostBuildEvent> |
188 | </PostBuildEvent> | 181 | </PostBuildEvent> |
189 | </PropertyGroup> | 182 | </PropertyGroup> |
190 | </Project> \ No newline at end of file | 183 | </Project> |