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/Data/SQLite/SQLiteRegionData.cs | |
parent | Attempt to locate SL client in LaunchSLClient under other Unices. (diff) | |
download | opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.zip opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.gz opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 9908735..b648ee8 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -1223,22 +1223,6 @@ namespace OpenSim.Data.SQLite | |||
1223 | s.TextureEntry = textureEntry; | 1223 | s.TextureEntry = textureEntry; |
1224 | 1224 | ||
1225 | s.ExtraParams = (byte[]) row["ExtraParams"]; | 1225 | s.ExtraParams = (byte[]) row["ExtraParams"]; |
1226 | // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); | ||
1227 | // string texture = encoding.GetString((Byte[])row["Texture"]); | ||
1228 | // if (!texture.StartsWith("<")) | ||
1229 | // { | ||
1230 | // //here so that we can still work with old format database files (ie from before I added xml serialization) | ||
1231 | // LLObject.TextureEntry textureEntry = null; | ||
1232 | // textureEntry = new LLObject.TextureEntry(new LLUUID(texture)); | ||
1233 | // s.TextureEntry = textureEntry.ToBytes(); | ||
1234 | // } | ||
1235 | // else | ||
1236 | // { | ||
1237 | // TextureBlock textureEntry = TextureBlock.FromXmlString(texture); | ||
1238 | // s.TextureEntry = textureEntry.TextureData; | ||
1239 | // s.ExtraParams = textureEntry.ExtraParams; | ||
1240 | // } | ||
1241 | |||
1242 | return s; | 1226 | return s; |
1243 | } | 1227 | } |
1244 | 1228 | ||