ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bullet-2.82

Browse Source
This commit is contained in:
Robert Adams
2014-09-03 21:21:01 -07:00
parent 3d65d22138 73e20b7f5f
commit 47ac103df7
23 changed files with 79 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/OpenSim.32BitLaunch.exe
View File

Binary file not shown.

3
bin/OpenSimDefaults.ini
View File

@@ -711,6 +711,9 @@
;
max_distance = 65535
; Allow avatars to cross into and out of the region.
AllowAvatarCrossing = true
; Minimum user level required for HyperGrid teleports
LevelHGTeleport = 0

BIN
bin/Robust.32BitLaunch.exe
View File

Binary file not shown.

10
bin/Robust.HG.ini.example
View File

@@ -372,16 +372,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
; Url to search service
; SearchURL = "http://127.0.0.1:8002/";
; For V2/3 Web Profiles
; Work in progress: The ProfileServerURL/OpenIDServerURL are
; being used in a development viewer as support for webprofiles
; is being developed across the componets
;
; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
;
; For V2/V3 webapp authentication SSO
; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
; For V3 destination guide
; DestinationGuide = "http://127.0.0.1/guide"

10
bin/Robust.ini.example
View File

@@ -331,16 +331,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
; Url to search service
; SearchURL = "http://127.0.0.1:8002/";
; For V2/3 Web Profiles
; Work in progress: The ProfileServerURL/OpenIDServerURL are
; being used in a development viewer as support for webprofiles
; is being developed across the componets
;
; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
;
; For V2/V3 webapp authentication SSO
; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
; For V3 destination guide
; DestinationGuide = "http://127.0.0.1/guide"