diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index bea2834..4d1611c 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -869,7 +869,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
869 | } | 869 | } |
870 | #endregion Notes | 870 | #endregion Notes |
871 | 871 | ||
872 | <<<<<<< HEAD | 872 | |
873 | #region User Preferences | 873 | #region User Preferences |
874 | /// <summary> | 874 | /// <summary> |
875 | /// Updates the user preferences. | 875 | /// Updates the user preferences. |
@@ -933,8 +933,6 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
933 | } | 933 | } |
934 | #endregion User Preferences | 934 | #endregion User Preferences |
935 | 935 | ||
936 | ======= | ||
937 | >>>>>>> avn/ubitvar | ||
938 | #region Avatar Properties | 936 | #region Avatar Properties |
939 | /// <summary> | 937 | /// <summary> |
940 | /// Update the avatars interests . | 938 | /// Update the avatars interests . |
@@ -1401,8 +1399,6 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
1401 | return null; | 1399 | return null; |
1402 | } | 1400 | } |
1403 | #endregion Util | 1401 | #endregion Util |
1404 | <<<<<<< HEAD | ||
1405 | ======= | ||
1406 | 1402 | ||
1407 | #region Web Util | 1403 | #region Web Util |
1408 | /// <summary> | 1404 | /// <summary> |
@@ -1580,6 +1576,5 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
1580 | return true; | 1576 | return true; |
1581 | } | 1577 | } |
1582 | #endregion Web Util | 1578 | #endregion Web Util |
1583 | >>>>>>> avn/ubitvar | ||
1584 | } | 1579 | } |
1585 | } | 1580 | } |