ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-23 08:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
UbitUmarov
2017-01-05 19:32:57 +00:00
parent 9d28fd41c6 b16abc8166
commit 254b26a7d5
960 changed files with 23754 additions and 23741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
View File

@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.Linden
{
// private static readonly ILog m_log =
// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene;
private IAssetService m_AssetService;
private bool m_Enabled = true;
@@ -64,7 +64,7 @@ namespace OpenSim.Region.ClientStack.Linden
private string m_URL2;
private string m_RedirectURL = null;
private string m_RedirectURL2 = null;
struct aPollRequest
{
public PollServiceMeshEventArgs thepoll;
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ClientStack.Linden
return;
m_scene = pScene;
m_assetService = pScene.AssetService;
}
@@ -371,7 +371,7 @@ namespace OpenSim.Region.ClientStack.Linden
{
string capUrl = "/CAPS/" + UUID.Random() + "/";
// Register this as a poll service
// Register this as a poll service
PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene);
args.Type = PollServiceEventArgs.EventType.Mesh;
@@ -422,7 +422,7 @@ namespace OpenSim.Region.ClientStack.Linden
private readonly Scene m_scene;
private ThrottleOutPacketType Throttle;
private readonly UUID User;
public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser)
{
ThrottleBytes = pBytes;
@@ -450,7 +450,7 @@ namespace OpenSim.Region.ClientStack.Linden
// Normal
if (BytesSent <= ThrottleBytes)
{
BytesSent += response.bytes;
BytesSent += response.bytes;
return true;
}
else
@@ -460,7 +460,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
return haskey;
}
public void ProcessTime()
{
PassTime();