seems to compile ( tests comented out)

2026-08-11 20:05:33 +08:00 · 2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -380,7 +380,6 @@ namespace OpenSim.Server.Handlers
        }
        #endregion Interests

-<<<<<<< HEAD
        #region User Preferences
        public bool UserPreferencesRequest(OSDMap json, ref JsonRpcResponse response)
        {
@@ -434,8 +433,7 @@ namespace OpenSim.Server.Handlers
        }
        #endregion User Preferences

-=======
->>>>>>> avn/ubitvar
+
        #region Utility
        public bool AvatarImageAssetsRequest(OSDMap json, ref JsonRpcResponse response)
        {