ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small clean up of files and directories

Browse Source
This commit is contained in:
MW
2007-04-25 13:03:48 +00:00
parent 46eaa79cd9
commit f7b51d63a8
56 changed files with 515 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim.Framework/AgentInventory.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Assets;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Inventory
{

2
OpenSim.Framework/IAssetServer.cs → OpenSim.Framework/Interfaces/IAssetServer.cs
View File

@@ -30,7 +30,7 @@ using System.Net.Sockets;
using System.IO;
using System.Threading;
using libsecondlife;
using OpenSim.Framework.Assets;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{

0
OpenSim.Framework/IConfig.cs → OpenSim.Framework/Interfaces/IConfig.cs
View File

0
OpenSim.Framework/IGenericConfig.cs → OpenSim.Framework/Interfaces/IGenericConfig.cs
View File

0
OpenSim.Framework/IGridConfig.cs → OpenSim.Framework/Interfaces/IGridConfig.cs
View File

5
OpenSim.Framework/IGridServer.cs → OpenSim.Framework/Interfaces/IGridServer.cs
View File

@@ -27,13 +27,14 @@
using System;
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.IO;
using libsecondlife;
using OpenSim;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{
@@ -51,7 +52,7 @@ namespace OpenSim.Framework.Interfaces
string GetName();
bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
void Close();
void Close();
}
public struct UUIDBlock

2
OpenSim.Framework/ILocalStorage.cs → OpenSim.Framework/Interfaces/ILocalStorage.cs
View File

@@ -27,7 +27,7 @@
using System;
using libsecondlife;
using OpenSim.Framework.Assets;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{

1
OpenSim.Framework/IScriptAPI.cs → OpenSim.Framework/Interfaces/IScriptAPI.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{

0
OpenSim.Framework/IScriptEngine.cs → OpenSim.Framework/Interfaces/IScriptEngine.cs
View File

0
OpenSim.Framework/IUserConfig.cs → OpenSim.Framework/Interfaces/IUserConfig.cs
View File

0
OpenSim.Framework/IUserServer.cs → OpenSim.Framework/Interfaces/IUserServer.cs
View File

1
OpenSim.Framework/LocalGridBase.cs → OpenSim.Framework/Interfaces/LocalGridBase.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{

21
OpenSim.Framework/RemoteGridBase.cs → OpenSim.Framework/Interfaces/RemoteGridBase.cs
View File

@@ -1,8 +1,9 @@
using System;
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{
@@ -22,14 +23,14 @@ namespace OpenSim.Framework.Interfaces
public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
public abstract void Close();
public abstract Hashtable GridData {
get;
set;
}
public abstract ArrayList neighbours {
get;
set;
}
public abstract Hashtable GridData {
get;
set;
}
public abstract ArrayList neighbours {
get;
set;
}
}
}

108
OpenSim.Framework/OpenSim.Framework.csproj
View File

@@ -78,72 +78,18 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<Compile Include="AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AgentInventory.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AssetBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="BlockingQueue.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="HeightMapGenHills.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IAssetServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IGenericConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IGridServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ILocalStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IScriptAPI.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IScriptEngine.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IUserConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LocalGridBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Login.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LoginService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NeighbourInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OSVector3.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="PrimData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RemoteGridBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfile.cs">
<SubType>Code</SubType>
</Compile>
@@ -162,9 +108,63 @@
<Compile Include="Util.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IAssetServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IGenericConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IGridServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\ILocalStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IScriptAPI.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IScriptEngine.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IUserConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\LocalGridBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\RemoteGridBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\Login.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NeighbourInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\OSVector3.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\PrimData.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>

36
OpenSim.Framework/OpenSim.Framework.dll.build
View File

@@ -11,35 +11,35 @@
<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="IGenericConfig.cs" />
<include name="IGridConfig.cs" />
<include name="IGridServer.cs" />
<include name="ILocalStorage.cs" />
<include name="IScriptAPI.cs" />
<include name="IScriptEngine.cs" />
<include name="IUserConfig.cs" />
<include name="IUserServer.cs" />
<include name="LocalGridBase.cs" />
<include name="Login.cs" />
<include name="LoginService.cs" />
<include name="NeighbourInfo.cs" />
<include name="OSVector3.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="Interfaces/IAssetServer.cs" />
<include name="Interfaces/IConfig.cs" />
<include name="Interfaces/IGenericConfig.cs" />
<include name="Interfaces/IGridConfig.cs" />
<include name="Interfaces/IGridServer.cs" />
<include name="Interfaces/ILocalStorage.cs" />
<include name="Interfaces/IScriptAPI.cs" />
<include name="Interfaces/IScriptEngine.cs" />
<include name="Interfaces/IUserConfig.cs" />
<include name="Interfaces/IUserServer.cs" />
<include name="Interfaces/LocalGridBase.cs" />
<include name="Interfaces/RemoteGridBase.cs" />
<include name="Properties/AssemblyInfo.cs" />
<include name="Types/AgentCiruitData.cs" />
<include name="Types/AssetBase.cs" />
<include name="Types/Login.cs" />
<include name="Types/NeighbourInfo.cs" />
<include name="Types/OSVector3.cs" />
<include name="Types/PrimData.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>

4
OpenSim.Framework/SimProfile.cs
View File

@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Sims
}
return this;
}
public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
{
try
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Sims
}
return this;
}
public SimProfile()
{

4
OpenSim.Framework/AgentCiruitData.cs → OpenSim.Framework/Types/AgentCiruitData.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
namespace OpenSim.Framework.Interfaces
namespace OpenSim.Framework.Types
{
public class AgentCircuitData
{
@@ -11,7 +11,7 @@ namespace OpenSim.Framework.Interfaces
public LLUUID AgentID;
public LLUUID SessionID;
public LLUUID SecureSessionID;
public LLVector3 startpos;
public LLVector3 startpos;
public string firstname;
public string lastname;
public uint circuitcode;

2
OpenSim.Framework/AssetBase.cs → OpenSim.Framework/Types/AssetBase.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
namespace OpenSim.Framework.Assets
namespace OpenSim.Framework.Types
{
public class AssetBase
{

2
OpenSim.Framework/Login.cs → OpenSim.Framework/Types/Login.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
namespace OpenSim.Framework.Interfaces
namespace OpenSim.Framework.Types
{
public class Login
{

2
OpenSim.Framework/NeighbourInfo.cs → OpenSim.Framework/Types/NeighbourInfo.cs
View File

@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework.Interfaces
namespace OpenSim.Framework.Types
{
public class NeighbourInfo
{

2
OpenSim.Framework/OSVector3.cs → OpenSim.Framework/Types/OSVector3.cs
View File

@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
namespace OpenSim.Framework.Types
{
public class OSVector3
{

2
OpenSim.Framework/PrimData.cs → OpenSim.Framework/Types/PrimData.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
namespace OpenSim.Framework.Assets
namespace OpenSim.Framework.Types
{
public class PrimData
{

2
OpenSim.Framework/UserProfile.cs
View File

@@ -32,7 +32,7 @@ namespace OpenSim.Framework.User
Circuits = new Dictionary<LLUUID, uint>();
Inventory = new AgentInventory();
homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
homepos = new LLVector3();
homepos = new LLVector3();
homelookat = new LLVector3();
}

14
OpenSim.Framework/UserProfileManager.cs
View File

@@ -106,7 +106,7 @@ namespace OpenSim.Framework.User
LLUUID AgentID = TheUser.UUID;
TheUser.InitSessionData();
//for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)
//SimProfile SimInfo = new SimProfile();
//SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.User
ArrayList AgentInventory = new ArrayList();
Console.WriteLine("adding inventory to response");
Hashtable TempHash;
Hashtable TempHash;
foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)
{
TempHash = new Hashtable();
@@ -200,7 +200,7 @@ namespace OpenSim.Framework.User
this.CustomiseResponse(ref responseData, TheUser);
response.Value = responseData;
// TheUser.SendDataToSim(SimInfo);
// TheUser.SendDataToSim(SimInfo);
return response;
}
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.User
//}
}
return response;
}
private static XmlRpcResponse CreateErrorConnectingToGridResponse()
@@ -258,9 +258,9 @@ namespace OpenSim.Framework.User
SimParams["firstname"] = theUser.firstname;
SimParams["lastname"] = theUser.lastname;
SimParams["agent_id"] = theUser.UUID.ToString();
SimParams["circuit_code"] = (Int32)circode;
SimParams["startpos_x"] = theUser.homepos.X.ToString();
SimParams["startpos_y"] = theUser.homepos.Y.ToString();
SimParams["circuit_code"] = (Int32)circode;
SimParams["startpos_x"] = theUser.homepos.X.ToString();
SimParams["startpos_y"] = theUser.homepos.Y.ToString();
SimParams["startpos_z"] = theUser.homepos.Z.ToString();
ArrayList SendParams = new ArrayList();
SendParams.Add(SimParams);

3
OpenSim.Framework/UserProfileManagerBase.cs
View File

@@ -103,7 +103,8 @@ namespace OpenSim.Framework.User
newprofile.firstname = firstname;
newprofile.lastname = lastname;
newprofile.MD5passwd = MD5passwd;
newprofile.UUID = LLUUID.Random();
newprofile.UUID = LLUUID.Random();
newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
this.UserProfiles.Add(newprofile.UUID, newprofile);
return newprofile;
}