mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 01:35:46 +08:00
fix merge
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user