diff options
author | Melanie | 2009-10-12 15:12:15 +0100 |
---|---|---|
committer | Melanie | 2009-10-12 15:12:15 +0100 |
commit | 70553a979e551efc47f56930282c6b01ff4277e1 (patch) | |
tree | 347632a3f51e7eace08e383f17b7f3e5ad218610 /OpenSim/Framework/Communications/Clients/RegionClient.cs | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE e... (diff) | |
download | opensim-SC-70553a979e551efc47f56930282c6b01ff4277e1.zip opensim-SC-70553a979e551efc47f56930282c6b01ff4277e1.tar.gz opensim-SC-70553a979e551efc47f56930282c6b01ff4277e1.tar.bz2 opensim-SC-70553a979e551efc47f56930282c6b01ff4277e1.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Framework/Communications/Clients/RegionClient.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Clients/RegionClient.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs index 220a9b6..297b046 100644 --- a/OpenSim/Framework/Communications/Clients/RegionClient.cs +++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
90 | try | 90 | try |
91 | { | 91 | { |
92 | strBuffer = OSDParser.SerializeJsonString(args); | 92 | strBuffer = OSDParser.SerializeJsonString(args); |
93 | UTF8Encoding str = new UTF8Encoding(); | 93 | Encoding str = Util.UTF8; |
94 | buffer = str.GetBytes(strBuffer); | 94 | buffer = str.GetBytes(strBuffer); |
95 | 95 | ||
96 | } | 96 | } |
@@ -218,7 +218,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
218 | try | 218 | try |
219 | { | 219 | { |
220 | strBuffer = OSDParser.SerializeJsonString(args); | 220 | strBuffer = OSDParser.SerializeJsonString(args); |
221 | UTF8Encoding str = new UTF8Encoding(); | 221 | Encoding str = Util.UTF8; |
222 | buffer = str.GetBytes(strBuffer); | 222 | buffer = str.GetBytes(strBuffer); |
223 | 223 | ||
224 | } | 224 | } |
@@ -459,7 +459,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
459 | try | 459 | try |
460 | { | 460 | { |
461 | strBuffer = OSDParser.SerializeJsonString(args); | 461 | strBuffer = OSDParser.SerializeJsonString(args); |
462 | UTF8Encoding str = new UTF8Encoding(); | 462 | Encoding str = Util.UTF8; |
463 | buffer = str.GetBytes(strBuffer); | 463 | buffer = str.GetBytes(strBuffer); |
464 | 464 | ||
465 | } | 465 | } |
@@ -543,7 +543,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
543 | try | 543 | try |
544 | { | 544 | { |
545 | strBuffer = OSDParser.SerializeJsonString(args); | 545 | strBuffer = OSDParser.SerializeJsonString(args); |
546 | UTF8Encoding str = new UTF8Encoding(); | 546 | Encoding str = Util.UTF8; |
547 | buffer = str.GetBytes(strBuffer); | 547 | buffer = str.GetBytes(strBuffer); |
548 | 548 | ||
549 | } | 549 | } |
@@ -637,7 +637,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
637 | try | 637 | try |
638 | { | 638 | { |
639 | strBuffer = OSDParser.SerializeJsonString(args); | 639 | strBuffer = OSDParser.SerializeJsonString(args); |
640 | UTF8Encoding str = new UTF8Encoding(); | 640 | Encoding str = Util.UTF8; |
641 | buffer = str.GetBytes(strBuffer); | 641 | buffer = str.GetBytes(strBuffer); |
642 | 642 | ||
643 | } | 643 | } |