Fix parameters hiding fields
This commit is contained in:
@@ -50,7 +50,7 @@ namespace LitJson
|
||||
void SetBoolean (bool val);
|
||||
void SetDouble (double val);
|
||||
void SetInt (int val);
|
||||
void SetJsonType (JsonType type);
|
||||
void SetJsonType (JsonType jtype);
|
||||
void SetLong (long val);
|
||||
void SetString (string val);
|
||||
|
||||
|
||||
@@ -771,12 +771,12 @@ namespace LitJson
|
||||
return type;
|
||||
}
|
||||
|
||||
public void SetJsonType (JsonType type)
|
||||
public void SetJsonType (JsonType jtype)
|
||||
{
|
||||
if (this.type == type)
|
||||
if (this.type == jtype)
|
||||
return;
|
||||
|
||||
switch (type) {
|
||||
switch (jtype) {
|
||||
case JsonType.None:
|
||||
break;
|
||||
|
||||
@@ -810,7 +810,7 @@ namespace LitJson
|
||||
break;
|
||||
}
|
||||
|
||||
this.type = type;
|
||||
this.type = jtype;
|
||||
}
|
||||
|
||||
public string ToJson ()
|
||||
|
||||
@@ -301,12 +301,12 @@ namespace GridProxy
|
||||
}
|
||||
}
|
||||
|
||||
private Packet callDelegates(Dictionary<PacketType, List<PacketDelegate>> delegates, Packet packet, IPEndPoint remoteEndPoint)
|
||||
private Packet callDelegates(Dictionary<PacketType, List<PacketDelegate>> delegates, Packet packet, IPEndPoint endpoint)
|
||||
{
|
||||
PacketType origType = packet.Type;
|
||||
foreach (PacketDelegate del in delegates[origType])
|
||||
{
|
||||
try { packet = del(packet, remoteEndPoint); }
|
||||
try { packet = del(packet, endpoint); }
|
||||
catch (Exception ex) { OpenMetaverse.Logger.Log("Error in packet delegate", Helpers.LogLevel.Warning, ex); }
|
||||
|
||||
// FIXME: how should we handle the packet type changing?
|
||||
|
||||
Reference in New Issue
Block a user