aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2012-01-29 22:50:59 +0000
committerMelanie2012-01-29 22:50:59 +0000
commit9a86a713d3fa71d00328ee6d005bb0c37a76f214 (patch)
tree0aa5d98a226548d45bd7fed54bc80a104ca6bc2e /bin
parentMake all NPCs owned by default (diff)
parentFix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/... (diff)
downloadopensim-SC-9a86a713d3fa71d00328ee6d005bb0c37a76f214.zip
opensim-SC-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.gz
opensim-SC-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.bz2
opensim-SC-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9d9cc3a..3b39f7f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -524,7 +524,7 @@
524 Cap_AttachmentResources = "" 524 Cap_AttachmentResources = ""
525 Cap_AvatarPickerSearch = "" 525 Cap_AvatarPickerSearch = ""
526 Cap_ChatSessionRequest = "" 526 Cap_ChatSessionRequest = ""
527 Cap_CopyInventoryFromNotecard = "" 527 Cap_CopyInventoryFromNotecard = "localhost"
528 Cap_DispatchRegionInfo = "" 528 Cap_DispatchRegionInfo = ""
529 Cap_EstateChangeInfo = "" 529 Cap_EstateChangeInfo = ""
530 Cap_EventQueueGet = "localhost" 530 Cap_EventQueueGet = "localhost"