diff options
| author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
| commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
| tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |
| parent | UbitOde: remove useless water collider from active code. (diff) | |
| parent | Merge branch 'avination' into careminster (diff) | |
| download | opensim-SC_OLD-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC_OLD-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC_OLD-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC_OLD-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 74f5208..03481d2 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |||
| @@ -482,10 +482,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
| 482 | // Convert to base64 | 482 | // Convert to base64 |
| 483 | // | 483 | // |
| 484 | string filetext = Convert.ToBase64String(data); | 484 | string filetext = Convert.ToBase64String(data); |
| 485 | 485 | Byte[] buf = Encoding.ASCII.GetBytes(filetext); | |
| 486 | ASCIIEncoding enc = new ASCIIEncoding(); | ||
| 487 | |||
| 488 | Byte[] buf = enc.GetBytes(filetext); | ||
| 489 | 486 | ||
| 490 | m_log.Info("MRM 9"); | 487 | m_log.Info("MRM 9"); |
| 491 | 488 | ||