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

Merge branch 'master' into diva-textures

Browse Source
This commit is contained in:
Melanie
2009-10-02 08:23:38 +01:00
parent 3ba36bb4d8 a2cdbd784d
commit 31d8cec0f8
356 changed files with 8423 additions and 5997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
View File

@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
transactions.RequestUpdateTaskInventoryItem(remoteClient, part, transactionID, item);
}
}
/// <summary>
/// Request that a client (agent) begin an asset transfer.

10
OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
View File

@@ -49,9 +49,9 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
/// </summary>
protected Dictionary<UUID, Caps> m_capsHandlers = new Dictionary<UUID, Caps>();
protected Dictionary<UUID, string> capsPaths = new Dictionary<UUID, string>();
protected Dictionary<UUID, string> capsPaths = new Dictionary<UUID, string>();
protected Dictionary<UUID, Dictionary<ulong, string>> childrenSeeds
= new Dictionary<UUID, Dictionary<ulong, string>>();
= new Dictionary<UUID, Dictionary<ulong, string>>();
public void Initialise(IConfigSource source)
{
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
agentId, m_scene.RegionInfo.RegionName);
}
}
}
}
public Caps GetCapsHandlerForUser(UUID agentId)
{
@@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
}
return null;
}
}
public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID)
{
@@ -225,6 +225,6 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
y = y / Constants.RegionSize;
m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
}
}
}
}
}

2
OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs
View File

@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
{
// Only need to run through all this if there are entries in the ban list
if (bans.Count > 0)
{
{
IClientIPEndpoint ipEndpoint;
if (client.TryGet(out ipEndpoint))
{