aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Sirikata
diff options
context:
space:
mode:
authorMelanie2010-01-09 14:21:50 +0000
committerMelanie2010-01-09 14:21:50 +0000
commita764eb5dc740c4b7056acad5058d2da0c9c9c740 (patch)
treea1014fb5828a32f3355d0cb37a3ba7fce264dc05 /OpenSim/Client/Sirikata
parentMerge branch 'master' into careminster (diff)
parentAdd functionality to estate "Allowed Users" and "Allowed Groups". Allowed users (diff)
downloadopensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.zip
opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.gz
opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.bz2
opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Client/Sirikata')
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 87db85b..aaa3de3 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 }