From fe0528b98cfc13d26ac7f1bf6bc23655be1f52e5 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 19:09:50 +0000
Subject: *Added UUIDNameRequest packet support (untested, but should work --
 at least in sandbox mode) *Various small renamings

---
 OpenSim/Region/ClientStack/ClientView.API.cs                   |  3 ++-
 OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs        |  2 --
 OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs        |  8 +++++++-
 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj   | 10 +++++-----
 .../Region/ClientStack/OpenSim.Region.ClientStack.dll.build    |  6 +++---
 5 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5e346fb..9650b42 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -68,6 +68,8 @@ namespace OpenSim.Region.ClientStack
         public event GenericCall6 OnRemoveAvatar;
         public event RequestMapBlocks OnRequestMapBlocks;
         public event TeleportLocationRequest OnTeleportLocationRequest;
+        
+        public event UUIDNameRequest OnNameFromUUIDRequest;
 
         public event ParcelPropertiesRequest OnParcelPropertiesRequest;
         public event ParcelDivideRequest OnParcelDivideRequest;
@@ -75,7 +77,6 @@ namespace OpenSim.Region.ClientStack
         public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
 
         public event EstateOwnerMessageRequest OnEstateOwnerMessage;
-
         /// <summary>
         /// 
         /// </summary>
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index cbd10dc..0456e3c 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -192,7 +192,5 @@ namespace OpenSim.Region.ClientStack
             this.OutPacket(mbReply);
              */
         }
-
-       
     }
 }
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 51981b8..794ce79 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -492,7 +492,13 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.MoneyBalanceRequest:
                         this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
                         break;
-
+                    case PacketType.UUIDNameRequest:
+                        UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
+                        foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
+                        {
+                            OnNameFromUUIDRequest(UUIDBlock.ID, this);
+                        }
+                        break;
                     #region Parcel related packets
                     case PacketType.ParcelPropertiesRequest:
                         ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..e679174 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -134,22 +134,22 @@
     <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.PacketHandlers.cs">
+    <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
+    <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientView.API.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..95422c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -15,12 +15,12 @@
                 <include name="ClientStackNetworkHandler.cs" />
                 <include name="PacketServer.cs" />
                 <include name="UDPServer.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="ClientView.cs" />
                 <include name="ClientView.PacketHandlers.cs" />
+                <include name="RegionApplicationBase.cs" />
                 <include name="ClientView.API.cs" />
                 <include name="ClientView.ProcessPackets.cs" />
-                <include name="RegionApplicationBase.cs" />
-                <include name="ClientViewBase.cs" />
-                <include name="ClientView.cs" />
                 <include name="Assets/InventoryCache.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
-- 
cgit v1.1