fix merge

This commit is contained in:
UbitUmarov
2017-01-05 19:32:57 +00:00
960 changed files with 23754 additions and 23741 deletions

View File

@@ -48,14 +48,14 @@ namespace OpenSim.Framework.Servers.HttpServer
public DropMethod Drop;
public UUID Id;
public int TimeOutms;
public EventType Type;
public EventType Type;
public enum EventType : int
{
LongPoll = 0,
LslHttp = 1,
Inventory = 2,
Texture = 3,
Texture = 3,
Mesh = 4
}