diff options
author | Adam Frisby | 2008-05-01 18:50:44 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:50:44 +0000 |
commit | 76d8eaa4069d6445c47784168e274ba4253f7b9c (patch) | |
tree | 6f0f023b9c994253f3f6808edf94949c7ebd2d29 /OpenSim/Region/Storage/OpenSim.DataStore.MSSQL | |
parent | Attempt to locate SL client in LaunchSLClient under other Unices. (diff) | |
download | opensim-SC-76d8eaa4069d6445c47784168e274ba4253f7b9c.zip opensim-SC-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.gz opensim-SC-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.bz2 opensim-SC-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.xz |
* Thanks to Mic Bowman for inspiring me to look at that we are still using ASCIIEncoder in places we shouldn't.
Diffstat (limited to 'OpenSim/Region/Storage/OpenSim.DataStore.MSSQL')
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs index 39babd6..c917e1e 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | |||
@@ -656,21 +656,6 @@ namespace OpenSim.DataStore.MSSQL | |||
656 | 656 | ||
657 | 657 | ||
658 | s.ExtraParams = (byte[]) row["ExtraParams"]; | 658 | s.ExtraParams = (byte[]) row["ExtraParams"]; |
659 | // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); | ||
660 | // string texture = encoding.GetString((Byte[])row["Texture"]); | ||
661 | // if (!texture.StartsWith("<")) | ||
662 | // { | ||
663 | // //here so that we can still work with old format database files (ie from before I added xml serialization) | ||
664 | // LLObject.TextureEntry textureEntry = null; | ||
665 | // textureEntry = new LLObject.TextureEntry(new LLUUID(texture)); | ||
666 | // s.TextureEntry = textureEntry.ToBytes(); | ||
667 | // } | ||
668 | // else | ||
669 | // { | ||
670 | // TextureBlock textureEntry = TextureBlock.FromXmlString(texture); | ||
671 | // s.TextureEntry = textureEntry.TextureData; | ||
672 | // s.ExtraParams = textureEntry.ExtraParams; | ||
673 | // } | ||
674 | 659 | ||
675 | return s; | 660 | return s; |
676 | } | 661 | } |