Merge branch 'master' of /home/opensim/src/opensim

author: BlueWall 2012-02-03 18:20:26 -0500
committer: BlueWall 2012-02-03 18:20:26 -0500
commit: 0742630d813259483f0e56d1c6b807de78924c54 (patch)
tree: 8dacf402c0cd7065403f1f8c9735214825011448 /OpenSim/Region/OptionalModules
parent: Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ... (diff)
parent: Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i... (diff)
download: opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.zip
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.gz
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.bz2
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.xz
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 11f927c..c928af7 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1243,7 +1243,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
            
        }
-        public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
+        public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
        {
            
        }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 81bf9ed..be0d56e 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -933,7 +933,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)
        {
        }
-        public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
+        public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
        {
        }
author	BlueWall	2012-02-03 18:20:26 -0500
committer	BlueWall	2012-02-03 18:20:26 -0500
commit	0742630d813259483f0e56d1c6b807de78924c54 (patch)
tree	8dacf402c0cd7065403f1f8c9735214825011448 /OpenSim/Region/OptionalModules
parent	Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ... (diff)
parent	Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i... (diff)
download	opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.zip opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.gz opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.bz2 opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 11f927c..c928af7 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1243,7 +1243,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1243		1243
1244	}	1244	}
1245		1245
1246	public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)	1246	public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
1247	{	1247	{
1248		1248
1249	}	1249	}


diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 81bf9ed..be0d56e 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -933,7 +933,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
933	public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)	933	public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)
934	{	934	{
935	}	935	}
936	public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)	936	public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
937	{	937	{
938	}	938	}
939		939