You want large textures, you shall have! - Xfer system now working for large asset uploads

Fixed the VS solution file.
Now forwars ViewerEffect messages onto the other clients
Renamed OpenSim.Framework/Inventory.cs to OpenSim.Framework/AgentInventory.cs  

4 files changed, 113 insertions, 82 deletions

diff --git a/OpenSim.Framework/Inventory.cs b/OpenSim.Framework/AgentInventory.cs
index e34ea75..8ab2f3a 100644
--- a/OpenSim.Framework/Inventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -25,12 +25,12 @@ namespace OpenSim.Framework.Inventory
 

         public virtual void Initialise()

         {

-            Wearables = new AvatarWearable[2]; //should be 12 of these

-            for (int i = 0; i < 2; i++)

+            Wearables = new AvatarWearable[13]; //should be 12 of these

+            for (int i = 0; i < 13; i++)

             {

                 Wearables[i] = new AvatarWearable();

             }

-

+            

             InventoryRoot = new InventoryFolder();

             InventoryRoot.FolderID = LLUUID.Random();

             InventoryRoot.ParentID = new LLUUID();

@@ -40,16 +40,29 @@ namespace OpenSim.Framework.Inventory
             InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);

         }

 

-        public bool CreateNewFolder(LLUUID folderID)

+        public bool CreateNewFolder(LLUUID folderID, ushort type)

         {

             InventoryFolder Folder = new InventoryFolder();

             Folder.FolderID = folderID;

             Folder.OwnerID = this.AgentID;

+            Folder.DefaultType = type;

             this.InventoryFolders.Add(Folder.FolderID, Folder);

 

             return (true);

         }

 

+        public bool UpdateItem(LLUUID itemID, AssetBase asset)

+        {

+            if(this.InventoryItems.ContainsKey(itemID))

+            {

+                InventoryItem Item = this.InventoryItems[itemID];

+                Item.AssetID = asset.FullID;

+                Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + " so it now is set to asset " + asset.FullID.ToStringHyphenated());

+                //TODO need to update the rest of the info

+            }

+            return true;

+        }

+

         public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)

         {

             if (this.InventoryFolders.ContainsKey(folderID))

diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 745874c..b250d18 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Framework</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,18 +61,19 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -77,6 +84,7 @@
     <Compile Include="AgentCiruitData.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="AgentInventory.cs" />

     <Compile Include="AssetBase.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -98,9 +106,6 @@
     <Compile Include="ILocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Inventory.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="IUserServer.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -151,4 +156,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 3d29b2b..ccb2a60 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -1,63 +1,63 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Framework" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Framework" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AgentCiruitData.cs" />
-                <include name="AssetBase.cs" />
-                <include name="BlockingQueue.cs" />
-                <include name="HeightMapGenHills.cs" />
-                <include name="IAssetServer.cs" />
-                <include name="IConfig.cs" />
-                <include name="IGridServer.cs" />
-                <include name="ILocalStorage.cs" />
-                <include name="IUserServer.cs" />
-                <include name="Inventory.cs" />
-                <include name="LocalGridBase.cs" />
-                <include name="Login.cs" />
-                <include name="LoginService.cs" />
-                <include name="NeighbourInfo.cs" />
-                <include name="PrimData.cs" />
-                <include name="RemoteGridBase.cs" />
-                <include name="SimProfile.cs" />
-                <include name="SimProfileBase.cs" />
-                <include name="UserProfile.cs" />
-                <include name="UserProfileManager.cs" />
-                <include name="UserProfileManagerBase.cs" />
-                <include name="Util.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../bin/libsecondlife.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
+<?xml version="1.0" ?>

+<project name="OpenSim.Framework" default="build">

+    <target name="build">

+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />

+        <copy todir="${project::get-base-directory()}/${build.dir}">

+            <fileset basedir="${project::get-base-directory()}">

+            </fileset>

+        </copy>

+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

+            <resources prefix="OpenSim.Framework" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="AgentCiruitData.cs" />

+                    <include name="AgentInventory.cs" />

+                <include name="AssetBase.cs" />

+                <include name="BlockingQueue.cs" />

+                <include name="HeightMapGenHills.cs" />

+                <include name="IAssetServer.cs" />

+                <include name="IConfig.cs" />

+                <include name="IGridServer.cs" />

+                <include name="ILocalStorage.cs" />

+                <include name="IUserServer.cs" />

+                <include name="LocalGridBase.cs" />

+                <include name="Login.cs" />

+                <include name="LoginService.cs" />

+                <include name="NeighbourInfo.cs" />

+                <include name="PrimData.cs" />

+                <include name="RemoteGridBase.cs" />

+                <include name="SimProfile.cs" />

+                <include name="SimProfileBase.cs" />

+                <include name="UserProfile.cs" />

+                <include name="UserProfileManager.cs" />

+                <include name="UserProfileManagerBase.cs" />

+                <include name="Util.cs" />

+                <include name="Properties/AssemblyInfo.cs" />

+            </sources>

+            <references basedir="${project::get-base-directory()}">

+                <lib>

+                    <include name="${project::get-base-directory()}" />

+                    <include name="${project::get-base-directory()}/${build.dir}" />

+                </lib>

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

+                <include name="../bin/libsecondlife.dll" />

+            </references>

+        </csc>

+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />

+        <mkdir dir="${project::get-base-directory()}/../bin/"/>

+        <copy todir="${project::get-base-directory()}/../bin/">

+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

+                <include name="*.dll"/>

+                <include name="*.exe"/>

+            </fileset>

+        </copy>

+    </target>

+    <target name="clean">

+        <delete dir="${bin.dir}" failonerror="false" />

+        <delete dir="${obj.dir}" failonerror="false" />

+    </target>

+    <target name="doc" description="Creates documentation.">

+    </target>

+</project>

diff --git a/OpenSim.Framework/Util.cs b/OpenSim.Framework/Util.cs
index 042360d..440ce41 100644
--- a/OpenSim.Framework/Util.cs
+++ b/OpenSim.Framework/Util.cs
@@ -9,6 +9,8 @@ namespace OpenSim.Framework.Utilities
     public class Util

     {

         private static Random randomClass = new Random();

+        private static uint nextXferID = 10000;

+        private static object XferLock = new object();

 

         public static ulong UIntsToLong(uint X, uint Y)

         {

@@ -23,6 +25,17 @@ namespace OpenSim.Framework.Utilities
             }

         }

 

+        public static uint GetNextXferID()

+        {

+            uint id = 0;

+            lock(XferLock)

+            {

+                id = nextXferID;

+                nextXferID++;

+            }

+            return id;

+        }

+

         public Util()

         {