From e2dd15625f158c7f7d8f5ceec14f09e85dd8e2b6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 9 Jan 2015 08:31:56 -0800
Subject: Added GetDisplayNames capability. For now, we don't actually use
display names, and this cap returns the regular name. But this moves the
server side into the newer, preferred, protocol used by the viewer for
fetching the names of agents in the scene given their UUIDs. (the old
protocol is via UDP). This works fine in my limited tests, but could use
further testing by others.
---
.../Region/Framework/Interfaces/IUserManagement.cs | 96 ----------------------
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 +-
.../Scenes/Serialization/SceneObjectSerializer.cs | 1 +
3 files changed, 3 insertions(+), 97 deletions(-)
delete mode 100644 OpenSim/Region/Framework/Interfaces/IUserManagement.cs
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
deleted file mode 100644
index f8088c3..0000000
--- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-
-using OpenMetaverse;
-
-namespace OpenSim.Region.Framework.Interfaces
-{
- ///
- /// This maintains the relationship between a UUID and a user name.
- ///
- public interface IUserManagement
- {
- string GetUserName(UUID uuid);
- string GetUserHomeURL(UUID uuid);
- string GetUserUUI(UUID uuid);
- string GetUserServerURL(UUID uuid, string serverType);
-
- ///
- /// Get user ID by the given name.
- ///
- ///
- /// UUID.Zero if no user with that name is found or if the name is "Unknown User"
- UUID GetUserIdByName(string name);
-
- ///
- /// Get user ID by the given name.
- ///
- ///
- ///
- /// UUID.Zero if no user with that name is found or if the name is "Unknown User"
- UUID GetUserIdByName(string firstName, string lastName);
-
- ///
- /// Add a user.
- ///
- ///
- /// If an account is found for the UUID, then the names in this will be used rather than any information
- /// extracted from creatorData.
- ///
- ///
- /// The creator data for this user.
- void AddUser(UUID uuid, string creatorData);
-
- ///
- /// Add a user.
- ///
- ///
- /// The UUID is related to the name without any other checks being performed, such as user account presence.
- ///
- ///
- ///
- ///
- void AddUser(UUID uuid, string firstName, string lastName);
-
- ///
- /// Add a user.
- ///
- ///
- /// The arguments apart from uuid are formed into a creatorData string and processing proceeds as for the
- /// AddUser(UUID uuid, string creatorData) method.
- ///
- ///
- ///
- ///
- void AddUser(UUID uuid, string firstName, string lastName, string homeURL);
-
- bool IsLocalGridUser(UUID uuid);
- }
-}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index b14e2f7..8bd0c0a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -40,7 +40,8 @@ using OpenSim.Framework;
using OpenSim.Region.Framework;
using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
using PermissionMask = OpenSim.Framework.PermissionMask;
namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 3899b99..cb13ca4 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -38,6 +38,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Serialization.External;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
namespace OpenSim.Region.Framework.Scenes.Serialization
{
--
cgit v1.1