Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
commit
2291daa95a
|
@ -288,9 +288,6 @@
|
||||||
; if not defined - default machine name is being used
|
; if not defined - default machine name is being used
|
||||||
; (on Windows this mean NETBIOS name - useably only inside local network)
|
; (on Windows this mean NETBIOS name - useably only inside local network)
|
||||||
; ExternalHostNameForLSL=127.0.0.1
|
; ExternalHostNameForLSL=127.0.0.1
|
||||||
; Uncomment below to enable llRemoteData/remote channels
|
|
||||||
; remoteDataPort = 20800
|
|
||||||
|
|
||||||
|
|
||||||
; What is reported as the "X-Secondlife-Shard"
|
; What is reported as the "X-Secondlife-Shard"
|
||||||
; Defaults to the user server url if not set
|
; Defaults to the user server url if not set
|
||||||
|
@ -1303,12 +1300,3 @@
|
||||||
;XmlRpcRouterModule = "XmlRpcRouterModule"
|
;XmlRpcRouterModule = "XmlRpcRouterModule"
|
||||||
;XmlRpcPort = 20800
|
;XmlRpcPort = 20800
|
||||||
|
|
||||||
[Friends]
|
|
||||||
; The port the friendslist interregion comms will listen on
|
|
||||||
; Defaults to the simulator's TCP port
|
|
||||||
;Port = 0
|
|
||||||
|
|
||||||
; Uncomment one of the lines below. Use FriendsService for local
|
|
||||||
; operation, Connectors for remote operation
|
|
||||||
;Connector = "OpenSim.Services.FriendsService.dll"
|
|
||||||
Connector = "OpenSim.Services.Connectors.dll"
|
|
||||||
|
|
Loading…
Reference in New Issue