aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorMelanie2010-01-28 02:05:32 +0000
committerMelanie2010-01-28 02:05:32 +0000
commit6478bc9fb0279035ebd6be17e956f1e152e4e0a8 (patch)
tree4c323beed42b93688ac6a545d8ae9c0507acef9e /OpenSim/Framework/IClientAPI.cs
parentChanges WorldCommModule to ISharedRegionModule. (diff)
parent* .. More Endlines... (diff)
downloadopensim-SC_OLD-6478bc9fb0279035ebd6be17e956f1e152e4e0a8.zip
opensim-SC_OLD-6478bc9fb0279035ebd6be17e956f1e152e4e0a8.tar.gz
opensim-SC_OLD-6478bc9fb0279035ebd6be17e956f1e152e4e0a8.tar.bz2
opensim-SC_OLD-6478bc9fb0279035ebd6be17e956f1e152e4e0a8.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r--OpenSim/Framework/IClientAPI.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 3489af1..3f53258 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1447,10 +1447,10 @@ namespace OpenSim.Framework
1447 1447
1448 void SendUseCachedMuteList(); 1448 void SendUseCachedMuteList();
1449 1449
1450 void SendMuteListUpdate(string filename); 1450 void SendMuteListUpdate(string filename);
1451 1451
1452 void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals); 1452 void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
1453 1453
1454 void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes); 1454 void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
1455 1455
1456 void KillEndDone(); 1456 void KillEndDone();