aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework
diff options
context:
space:
mode:
authorMW2007-04-25 13:03:48 +0000
committerMW2007-04-25 13:03:48 +0000
commitf7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 (patch)
treeb9f8f1dac346906f1333aa3fc8da704466eda005 /OpenSim.Framework
parent* Added try{}catch{} to RunTerrainCmd (diff)
downloadopensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.zip
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.gz
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.bz2
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.xz
Small clean up of files and directories
Diffstat (limited to 'OpenSim.Framework')
-rw-r--r--OpenSim.Framework/AgentInventory.cs2
-rw-r--r--OpenSim.Framework/Interfaces/IAssetServer.cs (renamed from OpenSim.Framework/IAssetServer.cs)2
-rw-r--r--OpenSim.Framework/Interfaces/IConfig.cs (renamed from OpenSim.Framework/IConfig.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IGenericConfig.cs (renamed from OpenSim.Framework/IGenericConfig.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IGridConfig.cs (renamed from OpenSim.Framework/IGridConfig.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IGridServer.cs (renamed from OpenSim.Framework/IGridServer.cs)5
-rw-r--r--OpenSim.Framework/Interfaces/ILocalStorage.cs (renamed from OpenSim.Framework/ILocalStorage.cs)2
-rw-r--r--OpenSim.Framework/Interfaces/IScriptAPI.cs (renamed from OpenSim.Framework/IScriptAPI.cs)1
-rw-r--r--OpenSim.Framework/Interfaces/IScriptEngine.cs (renamed from OpenSim.Framework/IScriptEngine.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IUserConfig.cs (renamed from OpenSim.Framework/IUserConfig.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IUserServer.cs (renamed from OpenSim.Framework/IUserServer.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/LocalGridBase.cs (renamed from OpenSim.Framework/LocalGridBase.cs)1
-rw-r--r--OpenSim.Framework/Interfaces/RemoteGridBase.cs (renamed from OpenSim.Framework/RemoteGridBase.cs)21
-rw-r--r--OpenSim.Framework/OpenSim.Framework.csproj58
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build36
-rw-r--r--OpenSim.Framework/SimProfile.cs4
-rw-r--r--OpenSim.Framework/Types/AgentCiruitData.cs (renamed from OpenSim.Framework/AgentCiruitData.cs)4
-rw-r--r--OpenSim.Framework/Types/AssetBase.cs (renamed from OpenSim.Framework/AssetBase.cs)2
-rw-r--r--OpenSim.Framework/Types/Login.cs (renamed from OpenSim.Framework/Login.cs)2
-rw-r--r--OpenSim.Framework/Types/NeighbourInfo.cs (renamed from OpenSim.Framework/NeighbourInfo.cs)2
-rw-r--r--OpenSim.Framework/Types/OSVector3.cs (renamed from OpenSim.Framework/OSVector3.cs)2
-rw-r--r--OpenSim.Framework/Types/PrimData.cs (renamed from OpenSim.Framework/PrimData.cs)2
-rw-r--r--OpenSim.Framework/UserProfile.cs2
-rw-r--r--OpenSim.Framework/UserProfileManager.cs14
-rw-r--r--OpenSim.Framework/UserProfileManagerBase.cs3
25 files changed, 85 insertions, 80 deletions
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index f715129..cabefc9 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5using libsecondlife.Packets; 5using libsecondlife.Packets;
6using OpenSim.Framework.Assets; 6using OpenSim.Framework.Types;
7 7
8namespace OpenSim.Framework.Inventory 8namespace OpenSim.Framework.Inventory
9{ 9{
diff --git a/OpenSim.Framework/IAssetServer.cs b/OpenSim.Framework/Interfaces/IAssetServer.cs
index a0de548..3f86acc 100644
--- a/OpenSim.Framework/IAssetServer.cs
+++ b/OpenSim.Framework/Interfaces/IAssetServer.cs
@@ -30,7 +30,7 @@ using System.Net.Sockets;
30using System.IO; 30using System.IO;
31using System.Threading; 31using System.Threading;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Assets; 33using OpenSim.Framework.Types;
34 34
35namespace OpenSim.Framework.Interfaces 35namespace OpenSim.Framework.Interfaces
36{ 36{
diff --git a/OpenSim.Framework/IConfig.cs b/OpenSim.Framework/Interfaces/IConfig.cs
index 7b4c040..7b4c040 100644
--- a/OpenSim.Framework/IConfig.cs
+++ b/OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/OpenSim.Framework/IGenericConfig.cs b/OpenSim.Framework/Interfaces/IGenericConfig.cs
index a853fe4..a853fe4 100644
--- a/OpenSim.Framework/IGenericConfig.cs
+++ b/OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/OpenSim.Framework/IGridConfig.cs b/OpenSim.Framework/Interfaces/IGridConfig.cs
index b2f26da..b2f26da 100644
--- a/OpenSim.Framework/IGridConfig.cs
+++ b/OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/OpenSim.Framework/IGridServer.cs b/OpenSim.Framework/Interfaces/IGridServer.cs
index 9c06a6b..b01f308 100644
--- a/OpenSim.Framework/IGridServer.cs
+++ b/OpenSim.Framework/Interfaces/IGridServer.cs
@@ -27,13 +27,14 @@
27 27
28 28
29using System; 29using System;
30using System.Collections; 30using System.Collections;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Net; 32using System.Net;
33using System.Net.Sockets; 33using System.Net.Sockets;
34using System.IO; 34using System.IO;
35using libsecondlife; 35using libsecondlife;
36using OpenSim; 36using OpenSim;
37using OpenSim.Framework.Types;
37 38
38namespace OpenSim.Framework.Interfaces 39namespace OpenSim.Framework.Interfaces
39{ 40{
@@ -51,7 +52,7 @@ namespace OpenSim.Framework.Interfaces
51 string GetName(); 52 string GetName();
52 bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port); 53 bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
53 void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); 54 void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
54 void Close(); 55 void Close();
55 } 56 }
56 57
57 public struct UUIDBlock 58 public struct UUIDBlock
diff --git a/OpenSim.Framework/ILocalStorage.cs b/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 2c45baa..a4d2ba1 100644
--- a/OpenSim.Framework/ILocalStorage.cs
+++ b/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework.Assets; 30using OpenSim.Framework.Types;
31 31
32namespace OpenSim.Framework.Interfaces 32namespace OpenSim.Framework.Interfaces
33{ 33{
diff --git a/OpenSim.Framework/IScriptAPI.cs b/OpenSim.Framework/Interfaces/IScriptAPI.cs
index 2f58198..3ad0f06 100644
--- a/OpenSim.Framework/IScriptAPI.cs
+++ b/OpenSim.Framework/Interfaces/IScriptAPI.cs
@@ -1,6 +1,7 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Framework.Types;
4 5
5namespace OpenSim.Framework.Interfaces 6namespace OpenSim.Framework.Interfaces
6{ 7{
diff --git a/OpenSim.Framework/IScriptEngine.cs b/OpenSim.Framework/Interfaces/IScriptEngine.cs
index ed8974c..ed8974c 100644
--- a/OpenSim.Framework/IScriptEngine.cs
+++ b/OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/OpenSim.Framework/IUserConfig.cs b/OpenSim.Framework/Interfaces/IUserConfig.cs
index e15867d..e15867d 100644
--- a/OpenSim.Framework/IUserConfig.cs
+++ b/OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/OpenSim.Framework/IUserServer.cs b/OpenSim.Framework/Interfaces/IUserServer.cs
index 21f2721..21f2721 100644
--- a/OpenSim.Framework/IUserServer.cs
+++ b/OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/OpenSim.Framework/LocalGridBase.cs b/OpenSim.Framework/Interfaces/LocalGridBase.cs
index 6857d6d..c3ab262 100644
--- a/OpenSim.Framework/LocalGridBase.cs
+++ b/OpenSim.Framework/Interfaces/LocalGridBase.cs
@@ -2,6 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5using OpenSim.Framework.Types;
5 6
6namespace OpenSim.Framework.Interfaces 7namespace OpenSim.Framework.Interfaces
7{ 8{
diff --git a/OpenSim.Framework/RemoteGridBase.cs b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
index 0b72b9f..f24ec66 100644
--- a/OpenSim.Framework/RemoteGridBase.cs
+++ b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
@@ -1,8 +1,9 @@
1using System; 1using System;
2using System.Collections; 2using System.Collections;
3using System.Collections.Generic; 3using System.Collections.Generic;
4using System.Text; 4using System.Text;
5using libsecondlife; 5using libsecondlife;
6using OpenSim.Framework.Types;
6 7
7namespace OpenSim.Framework.Interfaces 8namespace OpenSim.Framework.Interfaces
8{ 9{
@@ -22,14 +23,14 @@ namespace OpenSim.Framework.Interfaces
22 public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port); 23 public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
23 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); 24 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
24 public abstract void Close(); 25 public abstract void Close();
25 public abstract Hashtable GridData { 26 public abstract Hashtable GridData {
26 get; 27 get;
27 set; 28 set;
28 } 29 }
29 30
30 public abstract ArrayList neighbours { 31 public abstract ArrayList neighbours {
31 get; 32 get;
32 set; 33 set;
33 } 34 }
34 } 35 }
35} 36}
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 68b7ef0..ea4817e 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -78,91 +78,91 @@
78 <ItemGroup> 78 <ItemGroup>
79 </ItemGroup> 79 </ItemGroup>
80 <ItemGroup> 80 <ItemGroup>
81 <Compile Include="AgentCiruitData.cs"> 81 <Compile Include="AgentInventory.cs">
82 <SubType>Code</SubType> 82 <SubType>Code</SubType>
83 </Compile> 83 </Compile>
84 <Compile Include="AgentInventory.cs"> 84 <Compile Include="BlockingQueue.cs">
85 <SubType>Code</SubType> 85 <SubType>Code</SubType>
86 </Compile> 86 </Compile>
87 <Compile Include="AssetBase.cs"> 87 <Compile Include="HeightMapGenHills.cs">
88 <SubType>Code</SubType> 88 <SubType>Code</SubType>
89 </Compile> 89 </Compile>
90 <Compile Include="BlockingQueue.cs"> 90 <Compile Include="LoginService.cs">
91 <SubType>Code</SubType> 91 <SubType>Code</SubType>
92 </Compile> 92 </Compile>
93 <Compile Include="HeightMapGenHills.cs"> 93 <Compile Include="SimProfile.cs">
94 <SubType>Code</SubType> 94 <SubType>Code</SubType>
95 </Compile> 95 </Compile>
96 <Compile Include="IAssetServer.cs"> 96 <Compile Include="SimProfileBase.cs">
97 <SubType>Code</SubType> 97 <SubType>Code</SubType>
98 </Compile> 98 </Compile>
99 <Compile Include="IConfig.cs"> 99 <Compile Include="UserProfile.cs">
100 <SubType>Code</SubType> 100 <SubType>Code</SubType>
101 </Compile> 101 </Compile>
102 <Compile Include="IGenericConfig.cs"> 102 <Compile Include="UserProfileManager.cs">
103 <SubType>Code</SubType> 103 <SubType>Code</SubType>
104 </Compile> 104 </Compile>
105 <Compile Include="IGridConfig.cs"> 105 <Compile Include="UserProfileManagerBase.cs">
106 <SubType>Code</SubType> 106 <SubType>Code</SubType>
107 </Compile> 107 </Compile>
108 <Compile Include="IGridServer.cs"> 108 <Compile Include="Util.cs">
109 <SubType>Code</SubType> 109 <SubType>Code</SubType>
110 </Compile> 110 </Compile>
111 <Compile Include="ILocalStorage.cs"> 111 <Compile Include="Interfaces\IAssetServer.cs">
112 <SubType>Code</SubType> 112 <SubType>Code</SubType>
113 </Compile> 113 </Compile>
114 <Compile Include="IScriptAPI.cs"> 114 <Compile Include="Interfaces\IConfig.cs">
115 <SubType>Code</SubType> 115 <SubType>Code</SubType>
116 </Compile> 116 </Compile>
117 <Compile Include="IScriptEngine.cs"> 117 <Compile Include="Interfaces\IGenericConfig.cs">
118 <SubType>Code</SubType> 118 <SubType>Code</SubType>
119 </Compile> 119 </Compile>
120 <Compile Include="IUserConfig.cs"> 120 <Compile Include="Interfaces\IGridConfig.cs">
121 <SubType>Code</SubType> 121 <SubType>Code</SubType>
122 </Compile> 122 </Compile>
123 <Compile Include="IUserServer.cs"> 123 <Compile Include="Interfaces\IGridServer.cs">
124 <SubType>Code</SubType> 124 <SubType>Code</SubType>
125 </Compile> 125 </Compile>
126 <Compile Include="LocalGridBase.cs"> 126 <Compile Include="Interfaces\ILocalStorage.cs">
127 <SubType>Code</SubType> 127 <SubType>Code</SubType>
128 </Compile> 128 </Compile>
129 <Compile Include="Login.cs"> 129 <Compile Include="Interfaces\IScriptAPI.cs">
130 <SubType>Code</SubType> 130 <SubType>Code</SubType>
131 </Compile> 131 </Compile>
132 <Compile Include="LoginService.cs"> 132 <Compile Include="Interfaces\IScriptEngine.cs">
133 <SubType>Code</SubType> 133 <SubType>Code</SubType>
134 </Compile> 134 </Compile>
135 <Compile Include="NeighbourInfo.cs"> 135 <Compile Include="Interfaces\IUserConfig.cs">
136 <SubType>Code</SubType> 136 <SubType>Code</SubType>
137 </Compile> 137 </Compile>
138 <Compile Include="OSVector3.cs"> 138 <Compile Include="Interfaces\IUserServer.cs">
139 <SubType>Code</SubType> 139 <SubType>Code</SubType>
140 </Compile> 140 </Compile>
141 <Compile Include="PrimData.cs"> 141 <Compile Include="Interfaces\LocalGridBase.cs">
142 <SubType>Code</SubType> 142 <SubType>Code</SubType>
143 </Compile> 143 </Compile>
144 <Compile Include="RemoteGridBase.cs"> 144 <Compile Include="Interfaces\RemoteGridBase.cs">
145 <SubType>Code</SubType> 145 <SubType>Code</SubType>
146 </Compile> 146 </Compile>
147 <Compile Include="SimProfile.cs"> 147 <Compile Include="Properties\AssemblyInfo.cs">
148 <SubType>Code</SubType> 148 <SubType>Code</SubType>
149 </Compile> 149 </Compile>
150 <Compile Include="SimProfileBase.cs"> 150 <Compile Include="Types\AgentCiruitData.cs">
151 <SubType>Code</SubType> 151 <SubType>Code</SubType>
152 </Compile> 152 </Compile>
153 <Compile Include="UserProfile.cs"> 153 <Compile Include="Types\AssetBase.cs">
154 <SubType>Code</SubType> 154 <SubType>Code</SubType>
155 </Compile> 155 </Compile>
156 <Compile Include="UserProfileManager.cs"> 156 <Compile Include="Types\Login.cs">
157 <SubType>Code</SubType> 157 <SubType>Code</SubType>
158 </Compile> 158 </Compile>
159 <Compile Include="UserProfileManagerBase.cs"> 159 <Compile Include="Types\NeighbourInfo.cs">
160 <SubType>Code</SubType> 160 <SubType>Code</SubType>
161 </Compile> 161 </Compile>
162 <Compile Include="Util.cs"> 162 <Compile Include="Types\OSVector3.cs">
163 <SubType>Code</SubType> 163 <SubType>Code</SubType>
164 </Compile> 164 </Compile>
165 <Compile Include="Properties\AssemblyInfo.cs"> 165 <Compile Include="Types\PrimData.cs">
166 <SubType>Code</SubType> 166 <SubType>Code</SubType>
167 </Compile> 167 </Compile>
168 </ItemGroup> 168 </ItemGroup>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index fb7fbd4..8048de5 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,35 +11,35 @@
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" />
15 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
16 <include name="AssetBase.cs" />
17 <include name="BlockingQueue.cs" /> 15 <include name="BlockingQueue.cs" />
18 <include name="HeightMapGenHills.cs" /> 16 <include name="HeightMapGenHills.cs" />
19 <include name="IAssetServer.cs" />
20 <include name="IConfig.cs" />
21 <include name="IGenericConfig.cs" />
22 <include name="IGridConfig.cs" />
23 <include name="IGridServer.cs" />
24 <include name="ILocalStorage.cs" />
25 <include name="IScriptAPI.cs" />
26 <include name="IScriptEngine.cs" />
27 <include name="IUserConfig.cs" />
28 <include name="IUserServer.cs" />
29 <include name="LocalGridBase.cs" />
30 <include name="Login.cs" />
31 <include name="LoginService.cs" /> 17 <include name="LoginService.cs" />
32 <include name="NeighbourInfo.cs" />
33 <include name="OSVector3.cs" />
34 <include name="PrimData.cs" />
35 <include name="RemoteGridBase.cs" />
36 <include name="SimProfile.cs" /> 18 <include name="SimProfile.cs" />
37 <include name="SimProfileBase.cs" /> 19 <include name="SimProfileBase.cs" />
38 <include name="UserProfile.cs" /> 20 <include name="UserProfile.cs" />
39 <include name="UserProfileManager.cs" /> 21 <include name="UserProfileManager.cs" />
40 <include name="UserProfileManagerBase.cs" /> 22 <include name="UserProfileManagerBase.cs" />
41 <include name="Util.cs" /> 23 <include name="Util.cs" />
24 <include name="Interfaces/IAssetServer.cs" />
25 <include name="Interfaces/IConfig.cs" />
26 <include name="Interfaces/IGenericConfig.cs" />
27 <include name="Interfaces/IGridConfig.cs" />
28 <include name="Interfaces/IGridServer.cs" />
29 <include name="Interfaces/ILocalStorage.cs" />
30 <include name="Interfaces/IScriptAPI.cs" />
31 <include name="Interfaces/IScriptEngine.cs" />
32 <include name="Interfaces/IUserConfig.cs" />
33 <include name="Interfaces/IUserServer.cs" />
34 <include name="Interfaces/LocalGridBase.cs" />
35 <include name="Interfaces/RemoteGridBase.cs" />
42 <include name="Properties/AssemblyInfo.cs" /> 36 <include name="Properties/AssemblyInfo.cs" />
37 <include name="Types/AgentCiruitData.cs" />
38 <include name="Types/AssetBase.cs" />
39 <include name="Types/Login.cs" />
40 <include name="Types/NeighbourInfo.cs" />
41 <include name="Types/OSVector3.cs" />
42 <include name="Types/PrimData.cs" />
43 </sources> 43 </sources>
44 <references basedir="${project::get-base-directory()}"> 44 <references basedir="${project::get-base-directory()}">
45 <lib> 45 <lib>
diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs
index ad3e028..8acb20b 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim.Framework/SimProfile.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Sims
41 } 41 }
42 return this; 42 return this;
43 } 43 }
44 44
45 public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey) 45 public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
46 { 46 {
47 try 47 try
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Sims
73 } 73 }
74 return this; 74 return this;
75 } 75 }
76 76
77 77
78 public SimProfile() 78 public SimProfile()
79 { 79 {
diff --git a/OpenSim.Framework/AgentCiruitData.cs b/OpenSim.Framework/Types/AgentCiruitData.cs
index e1a79b9..555b3b9 100644
--- a/OpenSim.Framework/AgentCiruitData.cs
+++ b/OpenSim.Framework/Types/AgentCiruitData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Interfaces 6namespace OpenSim.Framework.Types
7{ 7{
8 public class AgentCircuitData 8 public class AgentCircuitData
9 { 9 {
@@ -11,7 +11,7 @@ namespace OpenSim.Framework.Interfaces
11 public LLUUID AgentID; 11 public LLUUID AgentID;
12 public LLUUID SessionID; 12 public LLUUID SessionID;
13 public LLUUID SecureSessionID; 13 public LLUUID SecureSessionID;
14 public LLVector3 startpos; 14 public LLVector3 startpos;
15 public string firstname; 15 public string firstname;
16 public string lastname; 16 public string lastname;
17 public uint circuitcode; 17 public uint circuitcode;
diff --git a/OpenSim.Framework/AssetBase.cs b/OpenSim.Framework/Types/AssetBase.cs
index 8206b30..f6104f8 100644
--- a/OpenSim.Framework/AssetBase.cs
+++ b/OpenSim.Framework/Types/AssetBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Assets 6namespace OpenSim.Framework.Types
7{ 7{
8 public class AssetBase 8 public class AssetBase
9 { 9 {
diff --git a/OpenSim.Framework/Login.cs b/OpenSim.Framework/Types/Login.cs
index 8a67853..ed77a46 100644
--- a/OpenSim.Framework/Login.cs
+++ b/OpenSim.Framework/Types/Login.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Interfaces 6namespace OpenSim.Framework.Types
7{ 7{
8 public class Login 8 public class Login
9 { 9 {
diff --git a/OpenSim.Framework/NeighbourInfo.cs b/OpenSim.Framework/Types/NeighbourInfo.cs
index 8b4fa64..58b6cb1 100644
--- a/OpenSim.Framework/NeighbourInfo.cs
+++ b/OpenSim.Framework/Types/NeighbourInfo.cs
@@ -2,7 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Framework.Interfaces 5namespace OpenSim.Framework.Types
6{ 6{
7 public class NeighbourInfo 7 public class NeighbourInfo
8 { 8 {
diff --git a/OpenSim.Framework/OSVector3.cs b/OpenSim.Framework/Types/OSVector3.cs
index b5d1223..8fb840b 100644
--- a/OpenSim.Framework/OSVector3.cs
+++ b/OpenSim.Framework/Types/OSVector3.cs
@@ -2,7 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Framework 5namespace OpenSim.Framework.Types
6{ 6{
7 public class OSVector3 7 public class OSVector3
8 { 8 {
diff --git a/OpenSim.Framework/PrimData.cs b/OpenSim.Framework/Types/PrimData.cs
index ee4188d..9b41a12 100644
--- a/OpenSim.Framework/PrimData.cs
+++ b/OpenSim.Framework/Types/PrimData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Assets 6namespace OpenSim.Framework.Types
7{ 7{
8 public class PrimData 8 public class PrimData
9 { 9 {
diff --git a/OpenSim.Framework/UserProfile.cs b/OpenSim.Framework/UserProfile.cs
index 04e9fd5..5b7405a 100644
--- a/OpenSim.Framework/UserProfile.cs
+++ b/OpenSim.Framework/UserProfile.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework.User
32 Circuits = new Dictionary<LLUUID, uint>(); 32 Circuits = new Dictionary<LLUUID, uint>();
33 Inventory = new AgentInventory(); 33 Inventory = new AgentInventory();
34 homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); 34 homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
35 homepos = new LLVector3(); 35 homepos = new LLVector3();
36 homelookat = new LLVector3(); 36 homelookat = new LLVector3();
37 } 37 }
38 38
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index 33f2abd..eb8b7cd 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.User
106 106
107 LLUUID AgentID = TheUser.UUID; 107 LLUUID AgentID = TheUser.UUID;
108 TheUser.InitSessionData(); 108 TheUser.InitSessionData();
109 109
110 //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method) 110 //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)
111 //SimProfile SimInfo = new SimProfile(); 111 //SimProfile SimInfo = new SimProfile();
112 //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); 112 //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.User
140 140
141 ArrayList AgentInventory = new ArrayList(); 141 ArrayList AgentInventory = new ArrayList();
142 Console.WriteLine("adding inventory to response"); 142 Console.WriteLine("adding inventory to response");
143 Hashtable TempHash; 143 Hashtable TempHash;
144 foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values) 144 foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)
145 { 145 {
146 TempHash = new Hashtable(); 146 TempHash = new Hashtable();
@@ -200,7 +200,7 @@ namespace OpenSim.Framework.User
200 200
201 this.CustomiseResponse(ref responseData, TheUser); 201 this.CustomiseResponse(ref responseData, TheUser);
202 response.Value = responseData; 202 response.Value = responseData;
203 // TheUser.SendDataToSim(SimInfo); 203 // TheUser.SendDataToSim(SimInfo);
204 return response; 204 return response;
205 205
206 } 206 }
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.User
211 //} 211 //}
212 } 212 }
213 return response; 213 return response;
214 214
215 } 215 }
216 216
217 private static XmlRpcResponse CreateErrorConnectingToGridResponse() 217 private static XmlRpcResponse CreateErrorConnectingToGridResponse()
@@ -258,9 +258,9 @@ namespace OpenSim.Framework.User
258 SimParams["firstname"] = theUser.firstname; 258 SimParams["firstname"] = theUser.firstname;
259 SimParams["lastname"] = theUser.lastname; 259 SimParams["lastname"] = theUser.lastname;
260 SimParams["agent_id"] = theUser.UUID.ToString(); 260 SimParams["agent_id"] = theUser.UUID.ToString();
261 SimParams["circuit_code"] = (Int32)circode; 261 SimParams["circuit_code"] = (Int32)circode;
262 SimParams["startpos_x"] = theUser.homepos.X.ToString(); 262 SimParams["startpos_x"] = theUser.homepos.X.ToString();
263 SimParams["startpos_y"] = theUser.homepos.Y.ToString(); 263 SimParams["startpos_y"] = theUser.homepos.Y.ToString();
264 SimParams["startpos_z"] = theUser.homepos.Z.ToString(); 264 SimParams["startpos_z"] = theUser.homepos.Z.ToString();
265 ArrayList SendParams = new ArrayList(); 265 ArrayList SendParams = new ArrayList();
266 SendParams.Add(SimParams); 266 SendParams.Add(SimParams);
diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/OpenSim.Framework/UserProfileManagerBase.cs
index c9fbf4c..d1307a5 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/OpenSim.Framework/UserProfileManagerBase.cs
@@ -103,7 +103,8 @@ namespace OpenSim.Framework.User
103 newprofile.firstname = firstname; 103 newprofile.firstname = firstname;
104 newprofile.lastname = lastname; 104 newprofile.lastname = lastname;
105 newprofile.MD5passwd = MD5passwd; 105 newprofile.MD5passwd = MD5passwd;
106 newprofile.UUID = LLUUID.Random(); newprofile.Inventory.CreateRootFolder(newprofile.UUID, true); 106 newprofile.UUID = LLUUID.Random();
107 newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
107 this.UserProfiles.Add(newprofile.UUID, newprofile); 108 this.UserProfiles.Add(newprofile.UUID, newprofile);
108 return newprofile; 109 return newprofile;
109 } 110 }