Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-01-31 21:53:32 +00:00
4 changed files with 208 additions and 107 deletions

View File

@@ -9316,9 +9316,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
param1 = Convert.ToUInt32(Utils.BytesToString(messagePacket.ParamList[1].Parameter));
}
catch (Exception ex)
catch
{
}
}