aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim.Framework')
-rw-r--r--OpenSim.Framework/AgentInventory.cs (renamed from OpenSim.Framework/Inventory.cs)21
-rw-r--r--OpenSim.Framework/OpenSim.Framework.csproj35
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build126
-rw-r--r--OpenSim.Framework/Util.cs13
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
25 25
26 public virtual void Initialise() 26 public virtual void Initialise()
27 { 27 {
28 Wearables = new AvatarWearable[2]; //should be 12 of these 28 Wearables = new AvatarWearable[13]; //should be 12 of these
29 for (int i = 0; i < 2; i++) 29 for (int i = 0; i < 13; i++)
30 { 30 {
31 Wearables[i] = new AvatarWearable(); 31 Wearables[i] = new AvatarWearable();
32 } 32 }
33 33
34 InventoryRoot = new InventoryFolder(); 34 InventoryRoot = new InventoryFolder();
35 InventoryRoot.FolderID = LLUUID.Random(); 35 InventoryRoot.FolderID = LLUUID.Random();
36 InventoryRoot.ParentID = new LLUUID(); 36 InventoryRoot.ParentID = new LLUUID();
@@ -40,16 +40,29 @@ namespace OpenSim.Framework.Inventory
40 InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot); 40 InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
41 } 41 }
42 42
43 public bool CreateNewFolder(LLUUID folderID) 43 public bool CreateNewFolder(LLUUID folderID, ushort type)
44 { 44 {
45 InventoryFolder Folder = new InventoryFolder(); 45 InventoryFolder Folder = new InventoryFolder();
46 Folder.FolderID = folderID; 46 Folder.FolderID = folderID;
47 Folder.OwnerID = this.AgentID; 47 Folder.OwnerID = this.AgentID;
48 Folder.DefaultType = type;
48 this.InventoryFolders.Add(Folder.FolderID, Folder); 49 this.InventoryFolders.Add(Folder.FolderID, Folder);
49 50
50 return (true); 51 return (true);
51 } 52 }
52 53
54 public bool UpdateItem(LLUUID itemID, AssetBase asset)
55 {
56 if(this.InventoryItems.ContainsKey(itemID))
57 {
58 InventoryItem Item = this.InventoryItems[itemID];
59 Item.AssetID = asset.FullID;
60 Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + " so it now is set to asset " + asset.FullID.ToStringHyphenated());
61 //TODO need to update the rest of the info
62 }
63 return true;
64 }
65
53 public LLUUID AddToInventory(LLUUID folderID, AssetBase asset) 66 public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
54 { 67 {
55 if (this.InventoryFolders.ContainsKey(folderID)) 68 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 @@
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,7 +6,8 @@
6 <ProjectGuid>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</ProjectGuid> 6 <ProjectGuid>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</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></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Framework</AssemblyName> 13 <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Framework</RootNamespace> 21 <RootNamespace>OpenSim.Framework</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,18 +61,19 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System.Xml" > 72 <Reference Include="System.Xml">
66 <HintPath>System.Xml.dll</HintPath> 73 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="libsecondlife.dll" > 76 <Reference Include="libsecondlife.dll">
70 <HintPath>..\bin\libsecondlife.dll</HintPath> 77 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
@@ -77,6 +84,7 @@
77 <Compile Include="AgentCiruitData.cs"> 84 <Compile Include="AgentCiruitData.cs">
78 <SubType>Code</SubType> 85 <SubType>Code</SubType>
79 </Compile> 86 </Compile>
87 <Compile Include="AgentInventory.cs" />
80 <Compile Include="AssetBase.cs"> 88 <Compile Include="AssetBase.cs">
81 <SubType>Code</SubType> 89 <SubType>Code</SubType>
82 </Compile> 90 </Compile>
@@ -98,9 +106,6 @@
98 <Compile Include="ILocalStorage.cs"> 106 <Compile Include="ILocalStorage.cs">
99 <SubType>Code</SubType> 107 <SubType>Code</SubType>
100 </Compile> 108 </Compile>
101 <Compile Include="Inventory.cs">
102 <SubType>Code</SubType>
103 </Compile>
104 <Compile Include="IUserServer.cs"> 109 <Compile Include="IUserServer.cs">
105 <SubType>Code</SubType> 110 <SubType>Code</SubType>
106 </Compile> 111 </Compile>
@@ -151,4 +156,4 @@
151 <PostBuildEvent> 156 <PostBuildEvent>
152 </PostBuildEvent> 157 </PostBuildEvent>
153 </PropertyGroup> 158 </PropertyGroup>
154</Project> 159</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 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Framework" default="build"> 2<project name="OpenSim.Framework" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Framework" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentCiruitData.cs" /> 14 <include name="AgentCiruitData.cs" />
15 <include name="AssetBase.cs" /> 15 <include name="AgentInventory.cs" />
16 <include name="BlockingQueue.cs" /> 16 <include name="AssetBase.cs" />
17 <include name="HeightMapGenHills.cs" /> 17 <include name="BlockingQueue.cs" />
18 <include name="IAssetServer.cs" /> 18 <include name="HeightMapGenHills.cs" />
19 <include name="IConfig.cs" /> 19 <include name="IAssetServer.cs" />
20 <include name="IGridServer.cs" /> 20 <include name="IConfig.cs" />
21 <include name="ILocalStorage.cs" /> 21 <include name="IGridServer.cs" />
22 <include name="IUserServer.cs" /> 22 <include name="ILocalStorage.cs" />
23 <include name="Inventory.cs" /> 23 <include name="IUserServer.cs" />
24 <include name="LocalGridBase.cs" /> 24 <include name="LocalGridBase.cs" />
25 <include name="Login.cs" /> 25 <include name="Login.cs" />
26 <include name="LoginService.cs" /> 26 <include name="LoginService.cs" />
27 <include name="NeighbourInfo.cs" /> 27 <include name="NeighbourInfo.cs" />
28 <include name="PrimData.cs" /> 28 <include name="PrimData.cs" />
29 <include name="RemoteGridBase.cs" /> 29 <include name="RemoteGridBase.cs" />
30 <include name="SimProfile.cs" /> 30 <include name="SimProfile.cs" />
31 <include name="SimProfileBase.cs" /> 31 <include name="SimProfileBase.cs" />
32 <include name="UserProfile.cs" /> 32 <include name="UserProfile.cs" />
33 <include name="UserProfileManager.cs" /> 33 <include name="UserProfileManager.cs" />
34 <include name="UserProfileManagerBase.cs" /> 34 <include name="UserProfileManagerBase.cs" />
35 <include name="Util.cs" /> 35 <include name="Util.cs" />
36 <include name="Properties/AssemblyInfo.cs" /> 36 <include name="Properties/AssemblyInfo.cs" />
37 </sources> 37 </sources>
38 <references basedir="${project::get-base-directory()}"> 38 <references basedir="${project::get-base-directory()}">
39 <lib> 39 <lib>
40 <include name="${project::get-base-directory()}" /> 40 <include name="${project::get-base-directory()}" />
41 <include name="${project::get-base-directory()}/${build.dir}" /> 41 <include name="${project::get-base-directory()}/${build.dir}" />
42 </lib> 42 </lib>
43 <include name="System.dll" /> 43 <include name="System.dll" />
44 <include name="System.Xml.dll" /> 44 <include name="System.Xml.dll" />
45 <include name="../bin/libsecondlife.dll" /> 45 <include name="../bin/libsecondlife.dll" />
46 </references> 46 </references>
47 </csc> 47 </csc>
48 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 48 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
49 <mkdir dir="${project::get-base-directory()}/../bin/"/> 49 <mkdir dir="${project::get-base-directory()}/../bin/"/>
50 <copy todir="${project::get-base-directory()}/../bin/"> 50 <copy todir="${project::get-base-directory()}/../bin/">
51 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 51 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
52 <include name="*.dll"/> 52 <include name="*.dll"/>
53 <include name="*.exe"/> 53 <include name="*.exe"/>
54 </fileset> 54 </fileset>
55 </copy> 55 </copy>
56 </target> 56 </target>
57 <target name="clean"> 57 <target name="clean">
58 <delete dir="${bin.dir}" failonerror="false" /> 58 <delete dir="${bin.dir}" failonerror="false" />
59 <delete dir="${obj.dir}" failonerror="false" /> 59 <delete dir="${obj.dir}" failonerror="false" />
60 </target> 60 </target>
61 <target name="doc" description="Creates documentation."> 61 <target name="doc" description="Creates documentation.">
62 </target> 62 </target>
63</project> 63</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
9 public class Util 9 public class Util
10 { 10 {
11 private static Random randomClass = new Random(); 11 private static Random randomClass = new Random();
12 private static uint nextXferID = 10000;
13 private static object XferLock = new object();
12 14
13 public static ulong UIntsToLong(uint X, uint Y) 15 public static ulong UIntsToLong(uint X, uint Y)
14 { 16 {
@@ -23,6 +25,17 @@ namespace OpenSim.Framework.Utilities
23 } 25 }
24 } 26 }
25 27
28 public static uint GetNextXferID()
29 {
30 uint id = 0;
31 lock(XferLock)
32 {
33 id = nextXferID;
34 nextXferID++;
35 }
36 return id;
37 }
38
26 public Util() 39 public Util()
27 { 40 {
28 41
generated by cgit v1.1 at 2024-11-10 11:33:34 +0000