diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Framework/Serialization/External/UserProfileSerializer.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Framework/Serialization/External/UserProfileSerializer.cs')
| -rw-r--r-- | OpenSim/Framework/Serialization/External/UserProfileSerializer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs index eb77e65..fb269b7 100644 --- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs | |||
| @@ -36,7 +36,7 @@ namespace OpenSim.Framework.Serialization.External | |||
| 36 | /// Serialize and deserialize region settings as an external format. | 36 | /// Serialize and deserialize region settings as an external format. |
| 37 | /// </summary> | 37 | /// </summary> |
| 38 | public class UserProfileSerializer | 38 | public class UserProfileSerializer |
| 39 | { | 39 | { |
| 40 | public const int MAJOR_VERSION = 0; | 40 | public const int MAJOR_VERSION = 0; |
| 41 | public const int MINOR_VERSION = 1; | 41 | public const int MINOR_VERSION = 1; |
| 42 | 42 | ||
| @@ -65,6 +65,6 @@ namespace OpenSim.Framework.Serialization.External | |||
| 65 | sw.Close(); | 65 | sw.Close(); |
| 66 | 66 | ||
| 67 | return sw.ToString(); | 67 | return sw.ToString(); |
| 68 | } | 68 | } |
| 69 | } | 69 | } |
| 70 | } \ No newline at end of file | 70 | } \ No newline at end of file |