OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

LSLKeyTest
Diva Canto 2016-06-21 20:28:44 -07:00
parent f19199cf4a 5c81e03738
commit 74c79d1f88
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Capabilities.Handlers
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IUserManagement m_UserManagement; protected IUserManagement m_UserManagement;
public GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description) public GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description)
: base("GET", path, name, description) : base("GET", path, name, description)

26
OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs
View File

@ -57,16 +57,16 @@ namespace OpenSim.Region.ClientStack.Linden
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene; protected Scene m_scene;
private IUserManagement m_UserManager; protected IUserManagement m_UserManager;
private bool m_Enabled = false; protected bool m_Enabled = false;
private string m_URL; protected string m_URL;
#region ISharedRegionModule Members #region ISharedRegionModule Members
public void Initialise(IConfigSource source) public virtual void Initialise(IConfigSource source)
{ {
IConfig config = source.Configs["ClientStack.LindenCaps"]; IConfig config = source.Configs["ClientStack.LindenCaps"];
if (config == null) if (config == null)
@ -77,7 +77,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_Enabled = true; m_Enabled = true;
} }
public void AddRegion(Scene s) public virtual void AddRegion(Scene s)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
@ -85,7 +85,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_scene = s; m_scene = s;
} }
public void RemoveRegion(Scene s) public virtual void RemoveRegion(Scene s)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_scene = null; m_scene = null;
} }
public void RegionLoaded(Scene s) public virtual void RegionLoaded(Scene s)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
@ -103,22 +103,22 @@ namespace OpenSim.Region.ClientStack.Linden
m_scene.EventManager.OnRegisterCaps += RegisterCaps; m_scene.EventManager.OnRegisterCaps += RegisterCaps;
} }
public void PostInitialise() public virtual void PostInitialise()
{ {
} }
public void Close() { } public virtual void Close() { }
public string Name { get { return "GetDisplayNamesModule"; } } public virtual string Name { get { return "GetDisplayNamesModule"; } }
public Type ReplaceableInterface public virtual Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }
#endregion #endregion
public void RegisterCaps(UUID agentID, Caps caps) public virtual void RegisterCaps(UUID agentID, Caps caps)
{ {
UUID capID = UUID.Random(); UUID capID = UUID.Random();

8
OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@ -154,6 +154,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
#endregion #endregion
public virtual void OnViewerInstantMessage(IClientAPI client, GridInstantMessage im)
{
im.fromAgentName = client.FirstName + " " + client.LastName;
OnInstantMessage(client, im);
}
public virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im) public virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im)
{ {
byte dialog = im.dialog; byte dialog = im.dialog;
@ -198,8 +204,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (m_TransferModule != null) if (m_TransferModule != null)
{ {
if (client != null)
im.fromAgentName = client.FirstName + " " + client.LastName;
m_TransferModule.SendInstantMessage(im, m_TransferModule.SendInstantMessage(im,
delegate(bool success) delegate(bool success)
{ {