Merge branch 'master' into htb-throttle

This commit is contained in:
Melanie
2009-10-12 15:25:42 +01:00
9 changed files with 846 additions and 83 deletions

View File

@@ -90,7 +90,7 @@ namespace OpenSim.Framework.Communications.Clients
try
{
strBuffer = OSDParser.SerializeJsonString(args);
UTF8Encoding str = new UTF8Encoding();
Encoding str = Util.UTF8;
buffer = str.GetBytes(strBuffer);
}
@@ -218,7 +218,7 @@ namespace OpenSim.Framework.Communications.Clients
try
{
strBuffer = OSDParser.SerializeJsonString(args);
UTF8Encoding str = new UTF8Encoding();
Encoding str = Util.UTF8;
buffer = str.GetBytes(strBuffer);
}
@@ -459,7 +459,7 @@ namespace OpenSim.Framework.Communications.Clients
try
{
strBuffer = OSDParser.SerializeJsonString(args);
UTF8Encoding str = new UTF8Encoding();
Encoding str = Util.UTF8;
buffer = str.GetBytes(strBuffer);
}
@@ -543,7 +543,7 @@ namespace OpenSim.Framework.Communications.Clients
try
{
strBuffer = OSDParser.SerializeJsonString(args);
UTF8Encoding str = new UTF8Encoding();
Encoding str = Util.UTF8;
buffer = str.GetBytes(strBuffer);
}
@@ -637,7 +637,7 @@ namespace OpenSim.Framework.Communications.Clients
try
{
strBuffer = OSDParser.SerializeJsonString(args);
UTF8Encoding str = new UTF8Encoding();
Encoding str = Util.UTF8;
buffer = str.GetBytes(strBuffer);
}