diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs index 49aa8ba..bc88184 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | |||
@@ -380,6 +380,7 @@ namespace OpenSim.Server.Handlers | |||
380 | } | 380 | } |
381 | #endregion Interests | 381 | #endregion Interests |
382 | 382 | ||
383 | <<<<<<< HEAD | ||
383 | #region User Preferences | 384 | #region User Preferences |
384 | public bool UserPreferencesRequest(OSDMap json, ref JsonRpcResponse response) | 385 | public bool UserPreferencesRequest(OSDMap json, ref JsonRpcResponse response) |
385 | { | 386 | { |
@@ -433,6 +434,8 @@ namespace OpenSim.Server.Handlers | |||
433 | } | 434 | } |
434 | #endregion User Preferences | 435 | #endregion User Preferences |
435 | 436 | ||
437 | ======= | ||
438 | >>>>>>> avn/ubitvar | ||
436 | #region Utility | 439 | #region Utility |
437 | public bool AvatarImageAssetsRequest(OSDMap json, ref JsonRpcResponse response) | 440 | public bool AvatarImageAssetsRequest(OSDMap json, ref JsonRpcResponse response) |
438 | { | 441 | { |