diff options
| author | Melanie | 2012-07-13 02:27:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-13 02:27:16 +0100 |
| commit | 64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch) | |
| tree | 12e0aaae0401cde2e4310f25efa96a64559ae939 /OpenSim/Framework/Util.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff) | |
| download | opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 30bbfd4..384f716 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -148,6 +148,7 @@ namespace OpenSim.Framework | |||
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | public static Encoding UTF8 = Encoding.UTF8; | 150 | public static Encoding UTF8 = Encoding.UTF8; |
| 151 | public static Encoding UTF8NoBomEncoding = new UTF8Encoding(false); | ||
| 151 | 152 | ||
| 152 | /// <value> | 153 | /// <value> |
| 153 | /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) | 154 | /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) |