ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
This commit is contained in:
Melanie
2013-05-08 20:59:44 +01:00
parent 54d0cd85ad 601aa91163
commit bda4565067
16 changed files with 1223 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/OpenSimDefaults.ini
View File

@@ -541,7 +541,6 @@
;; in OpenSim.ini
;;
Cap_AttachmentResources = ""
Cap_AvatarPickerSearch = ""
Cap_ChatSessionRequest = ""
Cap_CopyInventoryFromNotecard = "localhost"
Cap_DispatchRegionInfo = ""
@@ -605,6 +604,10 @@
Cap_WebFetchInventoryDescendents = ""
Cap_FetchInventoryDescendents2 = "localhost"
Cap_FetchInventory2 = "localhost"
; Capability for searching for people
Cap_AvatarPickerSearch = "localhost"
[Chat]