aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authormingchen2007-06-11 19:01:50 +0000
committermingchen2007-06-11 19:01:50 +0000
commit6a560957beda0f657f77f2ff887a1dc3b4ddf144 (patch)
treecb32a0e75ade82ac911f89a9e21e8c335044723a /OpenSim
parent*Removed SimProfileBase from OpenSim (Unused/Depreciated) (diff)
downloadopensim-SC_OLD-6a560957beda0f657f77f2ff887a1dc3b4ddf144.zip
opensim-SC_OLD-6a560957beda0f657f77f2ff887a1dc3b4ddf144.tar.gz
opensim-SC_OLD-6a560957beda0f657f77f2ff887a1dc3b4ddf144.tar.bz2
opensim-SC_OLD-6a560957beda0f657f77f2ff887a1dc3b4ddf144.tar.xz
*Removed missing file in csproj
*Removed Avatar.Client.cs (unused)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj3
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.dll.build1
-rw-r--r--OpenSim/OpenSim.Region/World/Avatar.Client.cs75
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs1
4 files changed, 0 insertions, 80 deletions
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 365af66..9a5e5da 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -139,9 +139,6 @@
139 <Compile Include="World\AvatarAnimations.cs"> 139 <Compile Include="World\AvatarAnimations.cs">
140 <SubType>Code</SubType> 140 <SubType>Code</SubType>
141 </Compile> 141 </Compile>
142 <Compile Include="World\Avatar.Client.cs">
143 <SubType>Code</SubType>
144 </Compile>
145 <Compile Include="World\Avatar.cs"> 142 <Compile Include="World\Avatar.cs">
146 <SubType>Code</SubType> 143 <SubType>Code</SubType>
147 </Compile> 144 </Compile>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index a33d214..d6ddf0a 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -14,7 +14,6 @@
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/AvatarAnimations.cs" /> 16 <include name="World/AvatarAnimations.cs" />
17 <include name="World/Avatar.Client.cs" />
18 <include name="World/Avatar.cs" /> 17 <include name="World/Avatar.cs" />
19 <include name="World/Avatar.Update.cs" /> 18 <include name="World/Avatar.Update.cs" />
20 <include name="World/Entity.cs" /> 19 <include name="World/Entity.cs" />
diff --git a/OpenSim/OpenSim.Region/World/Avatar.Client.cs b/OpenSim/OpenSim.Region/World/Avatar.Client.cs
deleted file mode 100644
index 60ad024..0000000
--- a/OpenSim/OpenSim.Region/World/Avatar.Client.cs
+++ /dev/null
@@ -1,75 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife.Packets;
32
33namespace OpenSim.Region
34{
35 partial class Avatar
36 {
37 private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> updateList = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
38 private List<Entity> interestList = new List<Entity>();
39
40 /// <summary>
41 /// Forwards a packet to the Avatar's client (IClientAPI object).
42 /// Note: Quite likely to be obsolete once the Client API is finished
43 /// </summary>
44 /// <param name="packet"></param>
45 public void SendPacketToViewer(Packet packet)
46 {
47 this.ControllingClient.OutPacket(packet);
48 }
49
50 /// <summary>
51 ///
52 /// </summary>
53 /// <param name="terseBlock"></param>
54 public void AddTerseUpdateToViewersList(ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock)
55 {
56
57 }
58
59 /// <summary>
60 ///
61 /// </summary>
62 public void SendUpdateListToViewer()
63 {
64
65 }
66
67 /// <summary>
68 ///
69 /// </summary>
70 private void UpdateInterestList()
71 {
72
73 }
74 }
75}
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 519e73c..5a20456 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -129,7 +129,6 @@ namespace OpenSim
129 { 129 {
130 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false); 130 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
131 loginServer.Startup(); 131 loginServer.Startup();
132 //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession);
133 loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).SandManager.AddNewSession); 132 loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).SandManager.AddNewSession);
134 //sandbox mode with loginserver not using accounts 133 //sandbox mode with loginserver not using accounts
135 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); 134 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);