diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Framework/Serialization/External/UserProfileSerializer.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/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 |