aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorMelanie2010-01-09 14:17:44 +0000
committerMelanie2010-01-09 14:17:44 +0000
commit063f106cbbc2a805dc210fe16c30741ab24876cb (patch)
tree5c338b086d342c21ee7ce26663bd92195d91a139 /OpenSim/Client
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-063f106cbbc2a805dc210fe16c30741ab24876cb.zip
opensim-SC_OLD-063f106cbbc2a805dc210fe16c30741ab24876cb.tar.gz
opensim-SC_OLD-063f106cbbc2a805dc210fe16c30741ab24876cb.tar.bz2
opensim-SC_OLD-063f106cbbc2a805dc210fe16c30741ab24876cb.tar.xz
Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users
will be honored now, while allowed groups will not. This requires additional groups module integration work
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs2
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs2
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 6bf976c..3c98229 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1217,7 +1217,7 @@ namespace OpenSim.Client.MXP.ClientStack
1217 // Need to translate to MXP somehow 1217 // Need to translate to MXP somehow
1218 } 1218 }
1219 1219
1220 public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) 1220 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
1221 { 1221 {
1222 // Need to translate to MXP somehow 1222 // Need to translate to MXP somehow
1223 } 1223 }
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 8e5efe4..30d1575 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -760,7 +760,7 @@ namespace OpenSim.Client.Sirikata.ClientStack
760 throw new System.NotImplementedException(); 760 throw new System.NotImplementedException();
761 } 761 }
762 762
763 public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) 763 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
764 { 764 {
765 throw new System.NotImplementedException(); 765 throw new System.NotImplementedException();
766 } 766 }
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index f23acdc..6a119bd 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -767,7 +767,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
767 throw new System.NotImplementedException(); 767 throw new System.NotImplementedException();
768 } 768 }
769 769
770 public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) 770 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
771 { 771 {
772 throw new System.NotImplementedException(); 772 throw new System.NotImplementedException();
773 } 773 }