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

Can now turn on/off server side permission checking (on prim editing etc) from the opensim.ini file. Just add a line to the Startup section like : serverside_object_permissions = true

Browse Source 
Changes /editing that are made to clothing/ body parts in your inventory should now be saved between logins/ restarts.
This commit is contained in:
MW
2007-08-21 13:21:03 +00:00
parent 18d1031a88
commit 252b48fb3e
12 changed files with 378 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Framework/Communications/Cache/AssetTransactions.cs
View File

@@ -103,6 +103,15 @@ namespace OpenSim.Framework.Communications.Caches
}
}
public AssetBase GetTransactionAsset(LLUUID transactionID)
{
if (this.XferUploaders.ContainsKey(transactionID))
{
return XferUploaders[transactionID].GetAssetData();
}
return null;
}
// Nested Types
public class AssetCapsUploader
{
@@ -298,6 +307,7 @@ namespace OpenSim.Framework.Communications.Caches
private void DoCreateItem()
{
//really need to fix this call, if lbsa71 saw this he would die.
this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId);
if (userInfo != null)
@@ -324,6 +334,15 @@ namespace OpenSim.Framework.Communications.Caches
{
}
public AssetBase GetAssetData()
{
if (m_finished)
{
return this.Asset;
}
return null;
}
}
public class NoteCardCapsUpdate

4
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@@ -9,6 +9,10 @@ using Nini.Config;
namespace OpenSim.Framework.Communications.Caches
{
/// <summary>
/// Basically a hack to give us a Inventory library while we don't have a inventory server
/// once the server is fully implemented then should read the data from that
/// </summary>
public class LibraryRootFolder : InventoryFolder
{
private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000");

11
OpenSim/Framework/Communications/Cache/UserProfileCache.cs
View File

@@ -182,17 +182,6 @@ namespace OpenSim.Framework.Communications.Caches
private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
{
this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
//for now we manually create the root folder,
// but should be requesting all inventory from inventory server.
/* InventoryFolder folderInfo = new InventoryFolder();
folderInfo.agentID = userID;
folderInfo.folderID = userInfo.UserProfile.rootInventoryFolderID;
folderInfo.name = "My Inventory";
folderInfo.parentID = LLUUID.Zero;
folderInfo.type = 8;
folderInfo.version = 1;
userInfo.FolderReceive(userID, folderInfo);*/
}
/// <summary>

2
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@@ -87,6 +87,7 @@ namespace OpenSim.Framework.Interfaces
public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID);
public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
public delegate void UpdateInventoryItemTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID);
public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data);
public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data);
@@ -141,6 +142,7 @@ namespace OpenSim.Framework.Interfaces
event FetchInventoryDescendents OnFetchInventoryDescendents;
event FetchInventory OnFetchInventory;
event RequestTaskInventory OnRequestTaskInventory;
event UpdateInventoryItemTransaction OnUpdateInventoryItem;
event UDPAssetUploadRequest OnAssetUploadRequest;
event XferReceive OnXferReceive;
event RequestXfer OnRequestXfer;

1
OpenSim/Framework/General/NullClientAPI.cs
View File

@@ -58,6 +58,7 @@ namespace OpenSim.Framework
public event FetchInventoryDescendents OnFetchInventoryDescendents;
public event FetchInventory OnFetchInventory;
public event RequestTaskInventory OnRequestTaskInventory;
public event UpdateInventoryItemTransaction OnUpdateInventoryItem;
public event UDPAssetUploadRequest OnAssetUploadRequest;
public event XferReceive OnXferReceive;
public event RequestXfer OnRequestXfer;