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

Merge branch 'master' into careminster

avinationmerge
Melanie 2010-01-28 02:07:18 +00:00
parent e9c9a74e0a 6478bc9fb0
commit 2d9b69c186
10 changed files with 72 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Client/MXP/ClientStack/MXPClientView.cs
View File

@ -1688,15 +1688,15 @@ namespace OpenSim.Client.MXP.ClientStack
} }
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
{ {
} }
public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
{ {
} }
public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
{ {
} }
} }
} }

18
OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
View File

@ -1177,15 +1177,15 @@ namespace OpenSim.Client.Sirikata.ClientStack
} }
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
{ {
} }
public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
{ {
} }
public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
{ {
} }
#endregion #endregion

18
OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
View File

@ -1194,15 +1194,15 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
} }
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
{ {
} }
public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
{ {
} }
public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
{ {
} }
} }
} }

2
OpenSim/Framework/Communications/Clients/RegionClient.cs
View File

@ -83,7 +83,7 @@ namespace OpenSim.Framework.Communications.Clients
} }
// Add the regionhandle of the destination region // Add the regionhandle of the destination region
ulong regionHandle = GetRegionHandle(region.RegionHandle); ulong regionHandle = GetRegionHandle(region.RegionHandle);
args["destination_handle"] = OSD.FromString(regionHandle.ToString()); args["destination_handle"] = OSD.FromString(regionHandle.ToString());
args["teleport_flags"] = OSD.FromString(teleportFlags.ToString()); args["teleport_flags"] = OSD.FromString(teleportFlags.ToString());
string strBuffer = ""; string strBuffer = "";

8
OpenSim/Framework/IClientAPI.cs
View File

@ -1447,10 +1447,10 @@ namespace OpenSim.Framework
void SendUseCachedMuteList(); void SendUseCachedMuteList();
void SendMuteListUpdate(string filename); void SendMuteListUpdate(string filename);
void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals); void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes); void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
void KillEndDone(); void KillEndDone();

6
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
View File

@ -87,7 +87,7 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Scripting.WorldComm namespace OpenSim.Region.CoreModules.Scripting.WorldComm
{ {
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
public class WorldCommModule : INonSharedRegionModule, IWorldComm public class WorldCommModule : ISharedRegionModule, IWorldComm
{ {
// private static readonly ILog m_log = // private static readonly ILog m_log =
// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -127,6 +127,10 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
m_pending = Queue.Synchronized(m_pendingQ); m_pending = Queue.Synchronized(m_pendingQ);
} }
public void PostInitialise()
{
}
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
m_scene = scene; m_scene = scene;

18
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -1133,15 +1133,15 @@ namespace OpenSim.Region.Examples.SimpleModule
} }
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
{ {
} }
public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
{ {
} }
public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
{ {
} }
} }
} }

18
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -1657,15 +1657,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
} }
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
{ {
} }
public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
{ {
} }
public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
{ {
} }
} }
} }

18
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -1138,15 +1138,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
} }
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
{ {
} }
public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
{ {
} }
public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
{ {
} }
} }
} }

16
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -1194,14 +1194,14 @@ namespace OpenSim.Tests.Common.Mock
public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
{ {
} }
public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes) public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
{ {
} }
public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
{ {
} }
} }
} }