aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples
diff options
context:
space:
mode:
authorMelanie2010-01-09 14:21:50 +0000
committerMelanie2010-01-09 14:21:50 +0000
commita764eb5dc740c4b7056acad5058d2da0c9c9c740 (patch)
treea1014fb5828a32f3355d0cb37a3ba7fce264dc05 /OpenSim/Region/Examples
parentMerge branch 'master' into careminster (diff)
parentAdd functionality to estate "Allowed Users" and "Allowed Groups". Allowed users (diff)
downloadopensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.zip
opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.gz
opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.bz2
opensim-SC_OLD-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 3659711..fd97eaa 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -879,7 +879,7 @@ namespace OpenSim.Region.Examples.SimpleModule
879 { 879 {
880 } 880 }
881 881
882 public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) 882 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
883 { 883 {
884 } 884 }
885 885