OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deleted old inventoryCache.cs

afrisby
MW 2007-08-16 16:57:30 +00:00
parent 531f64a53b
commit 67873b8614
9 changed files with 28 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -30,7 +30,6 @@ using System;
using System.IO; using System.IO;
using libsecondlife; using libsecondlife;
using Nini.Config; using Nini.Config;
using OpenSim.Assets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;

317
OpenSim/Region/ClientStack/Assets/InventoryCache.cs
View File

@ -1,317 +0,0 @@
/*
* Copyright (c) Contributors, http://www.openmetaverse.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Types;
using OpenSim.Region.ClientStack;
using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder;
using InventoryItem = OpenSim.Framework.Inventory.InventoryItem;
namespace OpenSim.Assets
{
/// <summary>
/// Description of InventoryManager.
/// </summary>
public class InventoryCache
{
private Dictionary<LLUUID, AgentInventory> _agentsInventory;
private List<UserServerRequest> _serverRequests; //list of requests made to user server.
private Encoding _enc = Encoding.ASCII;
private const uint FULL_MASK_PERMISSIONS = 2147483647;
public InventoryCache()
{
_agentsInventory = new Dictionary<LLUUID, AgentInventory>();
_serverRequests = new List<UserServerRequest>();
}
public void AddNewAgentsInventory(AgentInventory agentInventory)
{
if (!this._agentsInventory.ContainsKey(agentInventory.AgentID))
{
this._agentsInventory.Add(agentInventory.AgentID, agentInventory);
}
}
public AgentInventory GetAgentsInventory(LLUUID agentID)
{
if (this._agentsInventory.ContainsKey(agentID))
{
return this._agentsInventory[agentID];
}
return null;
}
public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID)
{
return this.CreateNewInventoryFolder(remoteClient, folderID, 0);
}
public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type)
{
bool res = false;
if (folderID != LLUUID.Zero) //don't create a folder with a zero id
{
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type);
}
}
return res;
}
public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)
{
bool res = false;
if (folderID != LLUUID.Zero) //don't create a folder with a zero id
{
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type, folderName, parent);
}
}
return res;
}
public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, AssetBase asset)
{
LLUUID newItem = null;
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
newItem = this._agentsInventory[remoteClient.AgentID].AddToInventory(folderID, asset);
if (newItem != null)
{
InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[newItem];
this.SendItemUpdateCreate(remoteClient, Item);
}
}
return newItem;
}
public bool DeleteInventoryItem(ClientView remoteClient, LLUUID itemID)
{
bool res = false;
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
res = this._agentsInventory[remoteClient.AgentID].DeleteFromInventory(itemID);
if (res)
{
RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();
remove.AgentData.AgentID = remoteClient.AgentID;
remove.AgentData.SessionID = remoteClient.SessionID;
remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];
remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();
remove.InventoryData[0].ItemID = itemID;
remoteClient.OutPacket(remove);
}
}
return res;
}
public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, AssetBase asset)
{
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);
if (res)
{
InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
this.SendItemUpdateCreate(remoteClient, Item);
}
return res;
}
return false;
}
public bool UpdateInventoryItemDetails(ClientView remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
{
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);
if (res)
{
InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
this.SendItemUpdateCreate(remoteClient, Item);
}
return res;
}
return false;
}
public void FetchInventoryDescendents(ClientView userInfo, FetchInventoryDescendentsPacket FetchDescend)
{
if (this._agentsInventory.ContainsKey(userInfo.AgentID))
{
AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
if (FetchDescend.InventoryData.FetchItems)
{
if (agentInventory.InventoryFolders.ContainsKey(FetchDescend.InventoryData.FolderID))
{
InventoryFolder Folder = agentInventory.InventoryFolders[FetchDescend.InventoryData.FolderID];
InventoryDescendentsPacket Descend = new InventoryDescendentsPacket();
Descend.AgentData.AgentID = userInfo.AgentID;
Descend.AgentData.OwnerID = Folder.OwnerID;
Descend.AgentData.FolderID = FetchDescend.InventoryData.FolderID;
Descend.AgentData.Descendents = Folder.Items.Count;
Descend.AgentData.Version = Folder.Items.Count;
Descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];
for (int i = 0; i < Folder.Items.Count; i++)
{
InventoryItem Item = Folder.Items[i];
Descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
Descend.ItemData[i].ItemID = Item.ItemID;
Descend.ItemData[i].AssetID = Item.AssetID;
Descend.ItemData[i].CreatorID = Item.CreatorID;
Descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
Descend.ItemData[i].CreationDate = 1000;
Descend.ItemData[i].Description = _enc.GetBytes(Item.Description + "\0");
Descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
Descend.ItemData[i].Flags = 1;
Descend.ItemData[i].FolderID = Item.FolderID;
Descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
Descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
Descend.ItemData[i].InvType = Item.InvType;
Descend.ItemData[i].Name = _enc.GetBytes(Item.Name + "\0");
Descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
Descend.ItemData[i].OwnerID = Item.OwnerID;
Descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
Descend.ItemData[i].SalePrice = 100;
Descend.ItemData[i].SaleType = 0;
Descend.ItemData[i].Type = Item.Type;
Descend.ItemData[i].CRC = Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
}
userInfo.OutPacket(Descend);
}
}
else
{
Console.WriteLine("fetch subfolders");
}
}
}
public void FetchInventory(ClientView userInfo, FetchInventoryPacket FetchItems)
{
if (this._agentsInventory.ContainsKey(userInfo.AgentID))
{
AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
for (int i = 0; i < FetchItems.InventoryData.Length; i++)
{
if (agentInventory.InventoryItems.ContainsKey(FetchItems.InventoryData[i].ItemID))
{
InventoryItem Item = agentInventory.InventoryItems[FetchItems.InventoryData[i].ItemID];
FetchInventoryReplyPacket InventoryReply = new FetchInventoryReplyPacket();
InventoryReply.AgentData.AgentID = userInfo.AgentID;
InventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
InventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
InventoryReply.InventoryData[0].ItemID = Item.ItemID;
InventoryReply.InventoryData[0].AssetID = Item.AssetID;
InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].Flags = 0;
InventoryReply.InventoryData[0].FolderID = Item.FolderID;
InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].InvType = Item.InvType;
InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].SalePrice = 100;
InventoryReply.InventoryData[0].SaleType = 0;
InventoryReply.InventoryData[0].Type = Item.Type;
InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
userInfo.OutPacket(InventoryReply);
}
}
}
}
private void SendItemUpdateCreate(ClientView remoteClient, InventoryItem Item)
{
UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();
InventoryReply.AgentData.AgentID = remoteClient.AgentID;
InventoryReply.AgentData.SimApproved = true;
InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
InventoryReply.InventoryData[0].ItemID = Item.ItemID;
InventoryReply.InventoryData[0].AssetID = Item.AssetID;
InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].CreationDate = 1000;
InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].Flags = 0;
InventoryReply.InventoryData[0].FolderID = Item.FolderID;
InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].InvType = Item.InvType;
InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
InventoryReply.InventoryData[0].SalePrice = 100;
InventoryReply.InventoryData[0].SaleType = 0;
InventoryReply.InventoryData[0].Type = Item.Type;
InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
remoteClient.OutPacket(InventoryReply);
}
}
public class UserServerRequest
{
public UserServerRequest()
{
}
}
}

11
OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
View File

@ -29,7 +29,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Assets;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
@ -45,13 +44,13 @@ namespace OpenSim.Region.ClientStack
private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>(); private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>();
private ClientView ourClient; private ClientView ourClient;
private AssetCache m_assetCache; private AssetCache m_assetCache;
private InventoryCache m_inventoryCache; // private InventoryCache m_inventoryCache;
public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache) public AgentAssetUpload(ClientView client, AssetCache assetCache )
{ {
this.ourClient = client; this.ourClient = client;
m_assetCache = assetCache; m_assetCache = assetCache;
m_inventoryCache = inventoryCache; // m_inventoryCache = inventoryCache;
} }
public void AddUpload(LLUUID transactionID, AssetBase asset) public void AddUpload(LLUUID transactionID, AssetBase asset)
@ -187,7 +186,7 @@ namespace OpenSim.Region.ClientStack
if (trans.AddToInventory) if (trans.AddToInventory)
{ {
// m_assetCache.AddAsset(trans.Asset); // m_assetCache.AddAsset(trans.Asset);
m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); //m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
} }
@ -235,7 +234,7 @@ namespace OpenSim.Region.ClientStack
{ {
//already complete so we can add it to the inventory //already complete so we can add it to the inventory
//m_assetCache.AddAsset(trans.Asset); //m_assetCache.AddAsset(trans.Asset);
m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset); // m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);
} }
else else
{ {

4
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@ -411,7 +411,7 @@ namespace OpenSim.Region.ClientStack
case PacketType.UpdateInventoryItem: case PacketType.UpdateInventoryItem:
UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
//Console.WriteLine(Pack.ToString()); //Console.WriteLine(Pack.ToString());
for (int i = 0; i < update.InventoryData.Length; i++) /*for (int i = 0; i < update.InventoryData.Length; i++)
{ {
if (update.InventoryData[i].TransactionID != LLUUID.Zero) if (update.InventoryData[i].TransactionID != LLUUID.Zero)
{ {
@ -439,7 +439,7 @@ namespace OpenSim.Region.ClientStack
{ {
m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ; m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
} }
} }*/
break; break;
case PacketType.RequestTaskInventory: case PacketType.RequestTaskInventory:
RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;

11
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -33,7 +33,6 @@ using System.Threading;
using System.Timers; using System.Timers;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Assets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
@ -69,13 +68,13 @@ namespace OpenSim.Region.ClientStack
public Thread ClientThread; public Thread ClientThread;
public LLVector3 startpos; public LLVector3 startpos;
private AgentAssetUpload UploadAssets; //private AgentAssetUpload UploadAssets;
private LLUUID newAssetFolder = LLUUID.Zero; private LLUUID newAssetFolder = LLUUID.Zero;
private bool debug = false; private bool debug = false;
protected IScene m_scene; protected IScene m_scene;
private Dictionary<uint, ClientView> m_clientThreads; private Dictionary<uint, ClientView> m_clientThreads;
private AssetCache m_assetCache; private AssetCache m_assetCache;
private InventoryCache m_inventoryCache; // private InventoryCache m_inventoryCache;
private int cachedtextureserial = 0; private int cachedtextureserial = 0;
protected AgentCircuitManager m_authenticateSessionsHandler; protected AgentCircuitManager m_authenticateSessionsHandler;
private Encoding enc = Encoding.ASCII; private Encoding enc = Encoding.ASCII;
@ -85,7 +84,7 @@ namespace OpenSim.Region.ClientStack
private int probesWithNoIngressPackets = 0; private int probesWithNoIngressPackets = 0;
private int lastPacketsReceived = 0; private int lastPacketsReceived = 0;
public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions ) public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, AgentCircuitManager authenSessions )
{ {
m_moneyBalance = 1000; m_moneyBalance = 1000;
@ -94,7 +93,7 @@ namespace OpenSim.Region.ClientStack
m_assetCache = assetCache; m_assetCache = assetCache;
m_networkServer = packServer; m_networkServer = packServer;
m_inventoryCache = inventoryCache; // m_inventoryCache = inventoryCache;
m_authenticateSessionsHandler = authenSessions; m_authenticateSessionsHandler = authenSessions;
MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request"); MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
@ -105,7 +104,7 @@ namespace OpenSim.Region.ClientStack
PacketQueue = new BlockingQueue<QueItem>(); PacketQueue = new BlockingQueue<QueItem>();
this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache); //this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
AckTimer = new Timer(500); AckTimer = new Timer(500);
AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed); AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
AckTimer.Start(); AckTimer.Start();

9
OpenSim/Region/ClientStack/PacketServer.cs
View File

@ -29,7 +29,6 @@ using System.Collections.Generic;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Assets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
@ -122,9 +121,9 @@ namespace OpenSim.Region.ClientStack
} }
protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions) protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, AgentCircuitManager authenSessions)
{ {
return new ClientView(remoteEP, initialcirpack, clientThreads, scene, assetCache, packServer, inventoryCache, authenSessions ); return new ClientView(remoteEP, initialcirpack, clientThreads, scene, assetCache, packServer, authenSessions );
} }
/// <summary> /// <summary>
@ -136,10 +135,10 @@ namespace OpenSim.Region.ClientStack
/// <param name="inventoryCache"></param> /// <param name="inventoryCache"></param>
/// <param name="authenticateSessionsClass"></param> /// <param name="authenticateSessionsClass"></param>
/// <returns></returns> /// <returns></returns>
public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AgentCircuitManager authenticateSessionsClass) public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, AgentCircuitManager authenticateSessionsClass)
{ {
ClientView newuser = ClientView newuser =
CreateNewClient(epSender, useCircuit, ClientThreads, _localScene, assetCache, this, inventoryCache, CreateNewClient(epSender, useCircuit, ClientThreads, _localScene, assetCache, this,
authenticateSessionsClass); authenticateSessionsClass);
this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);

17
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -28,7 +28,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using OpenSim.Assets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Data; using OpenSim.Framework.Data;
@ -47,7 +46,6 @@ namespace OpenSim.Region.ClientStack
public abstract class RegionApplicationBase public abstract class RegionApplicationBase
{ {
protected AssetCache m_assetCache; protected AssetCache m_assetCache;
protected InventoryCache m_inventoryCache;
protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>(); protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();
protected DateTime m_startuptime; protected DateTime m_startuptime;
protected NetworkServersInfo m_networkServersInfo; protected NetworkServersInfo m_networkServersInfo;
@ -58,7 +56,7 @@ namespace OpenSim.Region.ClientStack
protected LogBase m_log; protected LogBase m_log;
protected CommunicationsManager m_commsManager; protected CommunicationsManager m_commsManager;
public RegionApplicationBase( ) public RegionApplicationBase()
{ {
m_startuptime = DateTime.Now; m_startuptime = DateTime.Now;
} }
@ -72,13 +70,10 @@ namespace OpenSim.Region.ClientStack
ScenePresence.CreateDefaultTextureEntry(); ScenePresence.CreateDefaultTextureEntry();
m_httpServer = new BaseHttpServer( m_httpServerPort ); m_httpServer = new BaseHttpServer(m_httpServerPort);
m_log.Verbose("Starting HTTP server"); m_log.Verbose("Starting HTTP server");
m_httpServer.Start(); m_httpServer.Start();
m_inventoryCache = new InventoryCache();
} }
protected abstract void Initialize(); protected abstract void Initialize();
@ -90,7 +85,7 @@ namespace OpenSim.Region.ClientStack
} }
protected abstract LogBase CreateLog(); protected abstract LogBase CreateLog();
protected abstract PhysicsScene GetPhysicsScene( ); protected abstract PhysicsScene GetPhysicsScene();
protected abstract StorageManager CreateStorageManager(RegionInfo regionInfo); protected abstract StorageManager CreateStorageManager(RegionInfo regionInfo);
protected PhysicsScene GetPhysicsScene(string engine) protected PhysicsScene GetPhysicsScene(string engine)
@ -98,13 +93,13 @@ namespace OpenSim.Region.ClientStack
PhysicsPluginManager physicsPluginManager; PhysicsPluginManager physicsPluginManager;
physicsPluginManager = new PhysicsPluginManager(); physicsPluginManager = new PhysicsPluginManager();
physicsPluginManager.LoadPlugins(); physicsPluginManager.LoadPlugins();
return physicsPluginManager.GetPhysicsScene( engine ); return physicsPluginManager.GetPhysicsScene(engine);
} }
protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer) protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer)
{ {
AgentCircuitManager authen = new AgentCircuitManager(); AgentCircuitManager authen = new AgentCircuitManager();
udpServer = new UDPServer(regionInfo.InternalEndPoint.Port, m_assetCache, m_inventoryCache, m_log, authen); udpServer = new UDPServer(regionInfo.InternalEndPoint.Port, m_assetCache, m_log, authen);
StorageManager storageManager = CreateStorageManager(regionInfo); StorageManager storageManager = CreateStorageManager(regionInfo);
Scene scene = CreateScene(regionInfo, storageManager, authen); Scene scene = CreateScene(regionInfo, storageManager, authen);
@ -113,7 +108,7 @@ namespace OpenSim.Region.ClientStack
scene.LoadWorldMap(); scene.LoadWorldMap();
scene.PhysScene = GetPhysicsScene( ); scene.PhysScene = GetPhysicsScene();
scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D()); scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
scene.LoadPrimsFromStorage(); scene.LoadPrimsFromStorage();

7
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -30,7 +30,6 @@ using System.Collections.Generic;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Assets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
@ -55,7 +54,6 @@ namespace OpenSim.Region.ClientStack
protected int listenPort; protected int listenPort;
protected IScene m_localScene; protected IScene m_localScene;
protected AssetCache m_assetCache; protected AssetCache m_assetCache;
protected InventoryCache m_inventoryCache;
protected LogBase m_log; protected LogBase m_log;
protected AgentCircuitManager m_authenticateSessionsClass; protected AgentCircuitManager m_authenticateSessionsClass;
@ -84,11 +82,10 @@ namespace OpenSim.Region.ClientStack
{ {
} }
public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, LogBase console, AgentCircuitManager authenticateClass) public UDPServer(int port, AssetCache assetCache, LogBase console, AgentCircuitManager authenticateClass)
{ {
listenPort = port; listenPort = port;
this.m_assetCache = assetCache; this.m_assetCache = assetCache;
this.m_inventoryCache = inventoryCache;
this.m_log = console; this.m_log = console;
this.m_authenticateSessionsClass = authenticateClass; this.m_authenticateSessionsClass = authenticateClass;
this.CreatePacketServer(); this.CreatePacketServer();
@ -133,7 +130,7 @@ namespace OpenSim.Region.ClientStack
UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet; UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
this.PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_inventoryCache, m_authenticateSessionsClass); this.PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_authenticateSessionsClass);
} }
public void ServerListener() public void ServerListener()

1
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Net; using System.Net;
using libsecondlife; using libsecondlife;
using OpenSim.Assets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;