From 5a4cef6b362ebea22e240e1e0b48c14ac2d817d5 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 4 May 2010 21:16:20 +0200
Subject: make the events more useful by providing the source region
---
OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index b2135d2..329c3f5 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Region.Framework.Interfaces
{
- public delegate void ChangeDelegate();
+ public delegate void ChangeDelegate(UUID regionID);
public interface IEstateModule : IRegionModule
{
--
cgit v1.1
From 3761f7997134f3515421e9cf19ebb775f296bef2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 4 May 2010 23:45:59 +0200
Subject: Strip estate message sending out from the estate management module
and the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that is
right next to it on the UI. This implementation prevented people from adding
a more sane one in a module.
---
OpenSim/Region/Framework/Interfaces/IDialogModule.cs | 13 -------------
OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 2 ++
2 files changed, 2 insertions(+), 13 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index 35b4b63..be9764a 100644
--- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -120,19 +120,6 @@ namespace OpenSim.Region.Framework.Interfaces
void SendNotificationToUsersInRegion(UUID fromAvatarID, string fromAvatarName, string message);
///
- /// Send a notification to all users in the estate. This notification should remain around until the
- /// user explicitly dismisses it.
- ///
- ///
- /// On the Linden Labs Second Client (as of 1.21), this is a big blue box message on the upper right of the
- /// screen.
- ///
- /// The user sending the message
- /// The name of the user doing the sending
- /// The message being sent to the user
- void SendNotificationToUsersInEstate(UUID fromAvatarID, string fromAvatarName, string message);
-
- ///
/// Send a textbox entry for the client to respond to
///
void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid);
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 329c3f5..c850f7f 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -30,11 +30,13 @@ using OpenMetaverse;
namespace OpenSim.Region.Framework.Interfaces
{
public delegate void ChangeDelegate(UUID regionID);
+ public delegate void MessageDelegate(UUID regionID, UUID fromID, string fromName, string message);
public interface IEstateModule : IRegionModule
{
event ChangeDelegate OnRegionInfoChange;
event ChangeDelegate OnEstateInfoChange;
+ event MessageDelegate OnEstateMessage;
uint GetRegionFlags();
bool IsManager(UUID avatarID);
--
cgit v1.1
From 2ebe1482664533bb9b9040134fe4a23fbc939d51 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 6 May 2010 00:34:49 +0200
Subject: Plumb the viewer version string through into AgentCircuitData. Now
all that is left os to figure out what black magic turns AgentCircuitData
into AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3efb45f..b4bbbe3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -218,6 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_followCamAuto;
private int m_movementUpdateCount;
+ private string m_Viewer = String.Empty;
private const int NumMovementsBetweenRayCast = 5;
@@ -651,6 +652,11 @@ namespace OpenSim.Region.Framework.Scenes
set { m_flyDisabled = value; }
}
+ public string Viewer
+ {
+ get { return m_Viewer; }
+ }
+
#endregion
#region Constructor(s)
--
cgit v1.1
From e45f5ac12653f2ca5cef495db1607bea699ceb76 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 6 May 2010 00:54:21 +0200
Subject: Plumb Viewer version into ScenePresence for initial login. It's still
not carried along
---
OpenSim/Region/Framework/Scenes/Scene.cs | 1 +
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 +
2 files changed, 2 insertions(+)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1a46837..2579e9d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2652,6 +2652,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence sp = CreateAndAddScenePresence(client);
if (aCircuit != null)
sp.Appearance = aCircuit.Appearance;
+ sp.Viewer = aCircuit.Viewer;
// HERE!!! Do the initial attachments right here
// first agent upon login is a root agent by design.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b4bbbe3..fb66fcd 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -655,6 +655,7 @@ namespace OpenSim.Region.Framework.Scenes
public string Viewer
{
get { return m_Viewer; }
+ set { m_Viewer = value; }
}
#endregion
--
cgit v1.1
From ad2039a8c49cbdbee719fa6578365391f6acfc7e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 5 May 2010 22:48:05 +0100
Subject: Stab a test fail
---
OpenSim/Region/Framework/Scenes/Scene.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2579e9d..fff024f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2651,8 +2651,10 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence sp = CreateAndAddScenePresence(client);
if (aCircuit != null)
+ {
sp.Appearance = aCircuit.Appearance;
- sp.Viewer = aCircuit.Viewer;
+ sp.Viewer = aCircuit.Viewer;
+ }
// HERE!!! Do the initial attachments right here
// first agent upon login is a root agent by design.
--
cgit v1.1