From e0f8362e7a24a842a569b692652bc18784a2248b Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 14 Apr 2010 22:31:11 +0100
Subject: [PATCH 1/3] minor: add some documentation around the asset udp
 request path and replace some magic numbers with libomv enums

---
 OpenSim/Data/SQLite/SQLiteAssetData.cs        |  2 +-
 .../ClientStack/LindenUDP/LLClientView.cs     | 51 ++++++++++++-------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index ace40e5a0c..a032670588 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
                         cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
-
+ 
                         cmd.ExecuteNonQuery();
                     }
                 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f0f3932564..b3f5f09c04 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -7069,6 +7069,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return true;
         }
 
+        /// <summary>
+        /// This is the entry point for the UDP route by which the client can retrieve asset data.  If the request
+        /// is successful then a TransferInfo packet will be sent back, followed by one or more TransferPackets
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="Pack"></param>
+        /// <returns>This parameter may be ignored since we appear to return true whatever happens</returns>
         private bool HandleTransferRequest(IClientAPI sender, Packet Pack)
         {
             //m_log.Debug("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
@@ -7079,7 +7086,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Has to be done here, because AssetCache can't do it
             //
             UUID taskID = UUID.Zero;
-            if (transfer.TransferInfo.SourceType == 3)
+            if (transfer.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
             {
                 taskID = new UUID(transfer.TransferInfo.Params, 48);
                 UUID itemID = new UUID(transfer.TransferInfo.Params, 64);
@@ -11356,17 +11363,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return String.Empty;
         }
 
-        public void MakeAssetRequest(TransferRequestPacket transferRequest, UUID taskID)
+        /// <summary>
+        /// Make an asset request to the asset service in response to a client request.
+        /// </summary>
+        /// <param name="transferRequest"></param>
+        /// <param name="taskID"></param>
+        protected void MakeAssetRequest(TransferRequestPacket transferRequest, UUID taskID)
         {
             UUID requestID = UUID.Zero;
-            if (transferRequest.TransferInfo.SourceType == 2)
+            if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
             {
-                //direct asset request
                 requestID = new UUID(transferRequest.TransferInfo.Params, 0);
             }
-            else if (transferRequest.TransferInfo.SourceType == 3)
+            else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
             {
-                //inventory asset request
                 requestID = new UUID(transferRequest.TransferInfo.Params, 80);
                 //m_log.Debug("[XXX] inventory asset request " + requestID);
                 //if (taskID == UUID.Zero) // Agent
@@ -11379,29 +11389,34 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 //    }
             }
 
-            //check to see if asset is in local cache, if not we need to request it from asset server.
-            //m_log.Debug("asset request " + requestID);
+            //m_log.DebugFormat("[LLCLIENTVIEW]: {0} requesting asset {1}", Name, requestID);
 
             m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
-
         }
 
+        /// <summary>
+        /// When we get a reply back from the asset service in response to a client request, send back the data.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="sender"></param>
+        /// <param name="asset"></param>
         protected void AssetReceived(string id, Object sender, AssetBase asset)
         {
             TransferRequestPacket transferRequest = (TransferRequestPacket)sender;
 
             UUID requestID = UUID.Zero;
-            byte source = 2;
-            if ((transferRequest.TransferInfo.SourceType == 2) || (transferRequest.TransferInfo.SourceType == 2222))
+            byte source = (byte)SourceType.Asset;
+            
+            if ((transferRequest.TransferInfo.SourceType == (int)SourceType.Asset) 
+                || (transferRequest.TransferInfo.SourceType == 2222))
             {
-                //direct asset request
                 requestID = new UUID(transferRequest.TransferInfo.Params, 0);
             }
-            else if ((transferRequest.TransferInfo.SourceType == 3) || (transferRequest.TransferInfo.SourceType == 3333))
+            else if ((transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem) 
+                 || (transferRequest.TransferInfo.SourceType == 3333))
             {
-                //inventory asset request
                 requestID = new UUID(transferRequest.TransferInfo.Params, 80);
-                source = 3;
+                source = (byte)SourceType.SimInventoryItem;
                 //m_log.Debug("asset request " + requestID);
             }
 
@@ -11414,9 +11429,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     if ((userAssets != string.Empty) && (userAssets != m_hyperAssets.GetSimAssetServer()))
                     {
                         m_log.DebugFormat("[CLIENT]: asset {0} not found in local asset storage. Trying user's storage.", id);
-                        if (transferRequest.TransferInfo.SourceType == 2)
+                        if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
                             transferRequest.TransferInfo.SourceType = 2222; // marker
-                        else if (transferRequest.TransferInfo.SourceType == 3)
+                        else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
                             transferRequest.TransferInfo.SourceType = 3333; // marker
 
                         m_assetService.Get(userAssets + "/" + id, transferRequest, AssetReceived);
@@ -11431,7 +11446,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             // Scripts cannot be retrieved by direct request
-            if (transferRequest.TransferInfo.SourceType == 2 && asset.Type == 10)
+            if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset && asset.Type == 10)
                 return;
 
             // The asset is known to exist and is in our cache, so add it to the AssetRequests list

From 407b48f3bb20b643c694c725bbf94a02e73d9fd6 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Wed, 14 Apr 2010 19:22:48 -0700
Subject: [PATCH 2/3] The missing .csproj for the Robust 32 bit launcher

---
 .../Robust.32BitLaunch.csproj                 | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj

diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
new file mode 100644
index 0000000000..f19e082c28
--- /dev/null
+++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Robust._32BitLaunch</RootNamespace>
+    <AssemblyName>Robust.32BitLaunch</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenSim.Server, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\OpenSim.Server.exe</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file

From a7aab6af0cc82566e52cacc3c118ee2468a12c8a Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Wed, 14 Apr 2010 19:39:27 -0700
Subject: [PATCH 3/3] This version of the launcher exe works.

---
 bin/Robust.32BitLaunch.exe | Bin 5632 -> 5632 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 3119dc966e43aa93a26ae3c205b4675143755cdb..14a6db3f1f70a6b5767aeede7a5520821301b606 100644
GIT binary patch
delta 957
zcmZ8g-%Ha`6#v}&-4ET?a=ElDZF8n$TQZ%5C6ejVnq<*7!I-(3Q&#HaJ2ga5tA`99
za$JZc3Zh;NBWwKu)k9BF27y6fZ@!fUB0*A}@2o94aL)alANQPd&%JlbHRYO}mL8A2
zO3oDX5@+&ZyK%_@w1TJs_^M7?^9^CZK)RhAdxe#|L<g(jWqNUiO<3S057BXA4mHeH
zz?=(6q%%Mxk_NXp%~g|kw+trOO@IzEIfv{!(y%HEBUyMp3pFegn+>qID1|*=$pCIQ
z(^`&|ddeKmL~G(Z$(*h-2|2q}zLg32$BGqzj>z(;Qv{&zLVY2rCEQ*>SsaaiUn5h_
zM5K&kw5HNs>2Z6i4k;Ej`bjo$z%~Ia(CVTQ*!;tCY_Kmu2>75Trv0{{AB$Q*sbgyi
zp77H8ob-T*NX7g1dqCxsGE|&Ky2Xl4W*EgCDOUTDy<i$>`8qp-JrtsWk2|;q7f9;x
zl;0=(nm3bujjwPc^wK6-N+nUNa&d!I^s3Ie%@{)mN^qTI8ImOPFo&1C8u##?AH+O1
zcpaY5AR3U1-IDmCYO5$^l^BPU<W<x#A5>G+6P1y$d|5%jG_|7=ooZ{rZKe1BXp^UI
zs^2j2S(8)L9+eZZ_#ll3fr#7}9d4E*1JO%y`C`hiZDOgpoMo1`+WKhe=k{LT?D)55
z9rM~7VoGOYN5uo3gLR6xx|x$L3`Lb~#{!wnu0MI}mHS}`7|j`%H<lRckBqfZnLK5W
zCF8Nw<S=NN=+ak(=`*CCzta8;v6tS2moEH_-|JuhbuAX(m_4-+jxN3%a0iuZX*wJV
zCg?1oCOMWEj)Z!mqoJPIXrzZUIi7|G(m2*VGE4^+pY-KwZ?t=)PZ$il^6{PW|0SdH
nn=DCdA#<kA8q6$ZG_Fco4?L)bC-uX$jdM#~%4A++Nw@YlgeJp8

delta 836
zcmZWnPe_wt82`QR_HDX<Z0RbZY-3{cV~%aoEF}<=w3LcX3qfK|hpucJ+w7v~$_|E7
zjrXF^A#awa`fe#iM35H`;lU1h2}CfkPKgHfyqG)G1Ml<xp5OE5`@J7e!B_A-ozfZi
zJ`|@<@o}~I@`kNi1#W_@8ThUg-4&J?V4--X7C0%~+$Vb28UD~D9<Xs&jH;!z)8SA6
zHx-rvjAA+l5wr%xb*`V7J|G-kJ7CIED&uuX6fB{>66!A@13RoMWnDgM_8y^L?yVqS
zvk^9BV~2HybR}^Iqf0H>SyubsoDHa8BnId}c^AS*NpKbSI)z>5oCx^?{<DFGP=m}X
z7$zU!fM*<dM)xm?qxozyHJFnXv-I$FlI7`+B4Y&PSWjE`<yN{26kBAjWjGy|#bngZ
z+MFEaGT3AFkRK;Vm(0N`og|zx5U+H}&>DNkny^Kr0mt}HW<UdZ6DD|u8!*Q&5x>kA
zxee=lg_s>KB6=U+b%}!hmRg1T=s`6ek+-9WCp?5X%=0kj@t!x~1-j5oayGfJDOcTJ
z;m0Vx;R^HxQb411(6vYebdxqNCKdPbA*u2oTOm$+qpUJ*$rxe`+IHDzX1~2P@_0G&
zwym%|cIS1x{IpmzdDsQ9Yf@Q{@R+BSGDhzf`{v*^+QkkzQ_dcvvp`$7U<M-5*68Gq
zQS-;8)%K}Rt}nmq_ZH<Jy4ct|khs^I&LmQ~<lVZ#WWKIHolP7PV#ZQa7fB2!`f`ch
zNIE`}%lqp?Ey;Xm-$<%|$e$UAqx0_$(=?=1v0*vEV`|Y|sd1}?iDv6_&1T!w8G{Jp
U9L{U|4lCz{M$J*V!-@gpA2)iYQUCw|