Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 60 insertions, 35 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 842043e..6608d05 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -69,7 +69,7 @@
 
     ;# {PIDFile} {} {Path to PID file?} {}
     ;; Place to create a PID file
-    ; PIDFile = "/tmp/my.pid"
+    ; PIDFile = "/tmp/OpenSim.exe.pid"
 
     ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
     ;; Determine where OpenSimulator looks for the files which tell it
@@ -180,10 +180,6 @@
     ;; if the first change occurred this number of seconds ago.
     ; MaximumTimeBeforePersistenceConsidered = 600
 
-    ;# {see_into_this_sim_from_neighbor} {} {Should avatars in neighbor sims see objects in this sim?} {true false} true
-    ;; Should avatars in neighbor sims see objects in this sim?
-    ; see_into_this_sim_from_neighbor = true
-
     ;# {physical_prim} {} {Allow prims to be physical?} {true false} true
     ;; if you would like to allow prims to be physical and move by physics
     ;; with the physical checkbox in the client set this to true.
@@ -264,7 +260,7 @@
     ; AllowedClients =
 
     ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
-    ;# Bar (|) separated list of viewers which may not gain access to the regions.
+    ;; Bar (|) separated list of viewers which may not gain access to the regions.
     ;; One can use a Substring of the viewer name to disable only certain
     ;; versions
     ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
@@ -283,7 +279,7 @@
     ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
     ; GenerateMaptiles = true
 
-    ;# {MapImageModule} [] {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
+    ;# {MapImageModule} {} {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
     ;; The module to use in order to generate map images.
     ;; MapImageModule is the default.  Warp3DImageModule is an alternative experimental module that can 
     ;; generate better images.
@@ -418,8 +414,8 @@
     ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
     ; SMTP_SERVER_PASSWORD = ""
 
-[Network]
 
+[Network]
     ;# {ConsoleUser} {} {User name for console account} {}
     ;; Configure the remote console user here. This will not actually be used
     ;; unless you use -console=rest at startup.
@@ -456,6 +452,7 @@
     ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+
 [XMLRPC]
     ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
     ;; If enabled and set to XmlRpcRouterModule, this will post an event, 
@@ -470,7 +467,7 @@
     ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
     ;XmlRpcPort = 20800
 
-    ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com
+    ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} {} http://example.com
     ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
     ;; will use this address to register xmlrpc channels on the external
     ;; service 
@@ -503,15 +500,16 @@
     ;;   "<url>" -- capability enabled and served by some other server
     ;;
     ; These are enabled by default to localhost. Change if you see fit.
-      Cap_GetTexture = "localhost"
+    Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
+    Cap_AvatarPickerSearch = "localhost"
+
     ; This is disabled by default. Change if you see fit. Note that
     ; serving this cap from the simulators may lead to poor performace.
     Cap_WebFetchInventoryDescendents = ""
 
 
 [SimulatorFeatures]
-
     ;# {MapImageServerURI} {} {URL for the map server} {}
     ; Experimental new information sent in SimulatorFeatures cap for Kokua
     ; viewers 
@@ -532,7 +530,7 @@
     ;; Distance in meters that ordinary chat should travel.
     ; say_distance = 20
 
-    ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100
+    ;# {shout_distance} {} {Distance at which a shout is heard, in meters?} {} 100
     ;; Distance in meters that shouts should travel.
     ; shout_distance = 100
 
@@ -549,7 +547,7 @@
     ;; Module to handle offline messaging. The core module requires an external
     ;; web service to do this. See OpenSim wiki.
     ; OfflineMessageModule = OfflineMessageModule
-        ;; Or, alternatively, use this one, which works for both standalones and grids
+    ;; Or, alternatively, use this one, which works for both standalones and grids
     ; OfflineMessageModule = "Offline Message Module V2"
 
     ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
@@ -557,8 +555,8 @@
     ; OfflineMessageURL = http://yourserver/Offline.php or http://yourrobustserver:8003
 
     ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
-        ;; For standalones, this is the storage dll.
-        ; StorageProvider = OpenSim.Data.MySQL.dll
+    ;; For standalones, this is the storage dll.
+    ; StorageProvider = OpenSim.Data.MySQL.dll
 
     ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
     ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
@@ -570,9 +568,9 @@
     ;; must be set to allow offline messaging to work.
     ; MuteListURL = http://yourserver/Mute.php
 
-    ;; Control whether group messages are forwarded to offline users.
+    ;; Control whether group invites and notices are stored for offline users.
     ;; Default is true.
-    ;; This applies to the core groups module (Flotsam) only.
+    ;; This applies to both core groups module.
     ; ForwardOfflineGroupMessages = true
 
 
@@ -607,7 +605,8 @@
     ;; the "password" parameter)
     ; access_password = ""
 
-    ;# List the IP addresses allowed to call RemoteAdmin
+    ;# {access_ip_addresses} {enabled:true} {List the IP addresses allowed to call RemoteAdmin?} {}
+    ;; List the IP addresses allowed to call RemoteAdmin
     ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin.
     ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ...
     ; access_ip_addresses =
@@ -688,6 +687,12 @@
     ; enable_windlight = false
 
 
+[Materials]
+    ;# {enable_materials} {} {Enable Materials support?} {true false} true
+    ;; This enables the use of Materials.
+    ; enable_materials = true
+
+
 [DataSnapshot]
     ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
     ;; The following set of configs pertains to search.
@@ -792,7 +797,7 @@
     ; ScriptStopStrategy = abort
     
 
-    ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true
+    ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} {true false} true
     ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
     ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
     ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
@@ -945,43 +950,47 @@
     ;; Enables the groups module
     ; Enabled = false
 
+    ;# {LevelGroupCreate} {Enabled:true} {User level for creating groups} {} 0
+    ;; Minimum user level required to create groups
+    ; LevelGroupCreate = 0
+
     ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {Default "Groups Module V2"} Default
     ;; The default module can use a PHP XmlRpc server from the Flotsam project at
     ;; http://code.google.com/p/flotsam/
     ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
     ; Module = Default
-        ;; or... use Groups Module V2, which works for standalones and robust grids
-        ; Module = "Groups Module V2"
+    ;; or... use Groups Module V2, which works for standalones and robust grids
+    ; Module = "Groups Module V2"
 
     ;# {StorageProvider} {Module:Groups Module V2} {The DLL that provides the storage for V2} {OpenSim.Data.MySQL.dll} 
     ; StorageProvider = OpenSim.Data.MySQL.dll
 
     ;# {ServicesConnectorModule} {Module:GroupsModule Module:Groups Module V2} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector "Groups Local Service Connector" "Groups Remote Service Connector" "Groups HG Service Connector"} XmlRpcGroupsServicesConnector
     ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one as follows:
-        ;; -- for Flotsam Groups use XmlRpcGroupsServicesConnector
-        ;; -- for Simian Groups use SimianGroupsServicesConnector
-        ;; -- for V2 Groups, standalone, non-HG use "Groups Local Service Connector"
-        ;; -- for V2 Groups, grided sim, non-HG use "Groups Remote Service Connector"
-        ;; -- for V2 Groups, HG, both standalone and grided sim, use "Groups HG Service Connector"
-        ;; Note that the quotes "" around the words are important!
+    ;; -- for Flotsam Groups use XmlRpcGroupsServicesConnector
+    ;; -- for Simian Groups use SimianGroupsServicesConnector
+    ;; -- for V2 Groups, standalone, non-HG use "Groups Local Service Connector"
+    ;; -- for V2 Groups, grided sim, non-HG use "Groups Remote Service Connector"
+    ;; -- for V2 Groups, HG, both standalone and grided sim, use "Groups HG Service Connector"
+    ;; Note that the quotes "" around the words are important!
     ; ServicesConnectorModule = XmlRpcGroupsServicesConnector
 
     ;# {LocalService} {ServicesConnectorModule:Groups HG Service Connector} {Is the group service in this process or elsewhere?} {local remote} local
-        ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
+    ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
     ; LocalService = local
 
     ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {}
     ;; URI for the groups services of this grid
     ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
     ;; or http://mygridserver.com:82/Grid/ for SimianGrid
-        ;; or http:://mygridserver.com:8003 for robust, V2
-        ;; Leave it commented for standalones, V2
+    ;; or http:://mygridserver.com:8003 for robust, V2
+    ;; Leave it commented for standalones, V2
     ; GroupsServerURI = ""
 
     ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} 
-        ;; Used for V2 in HG only. For example
-        ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ;; Used for V2 in HG only. For example
+    ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
+    ;; If you have this set under [Startup], no need to set it here, leave it commented
     ; HomeURI = "" 
 
     ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
@@ -989,13 +998,19 @@
 
     ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule "Groups Messaging Module V2"} GroupsMessagingModule
     ; MessagingModule = GroupsMessagingModule
-        ;; or use V2 for Groups V2
-        ; MessagingModule = "Groups Messaging Module V2"
+    ;; or use V2 for Groups V2
+    ; MessagingModule = "Groups Messaging Module V2"
 
     ;# {NoticesEnabled} {Module:GroupsModule Module:Groups Module V2} {Enable group notices?} {true false} true
     ;; Enable Group Notices
     ; NoticesEnabled = true
 
+    ;# {MessageOnlineUsersOnly} {Module:GroupsModule Module} {Message online users only?} {true false} false
+    ; Experimental option to only message online users rather than all users
+    ; Should make large groups with few online members messaging faster, as the expense of more calls to presence service
+    ; Applies Flotsam Group only. V2 has this always on, no other option
+    ; MessageOnlineUsersOnly = false
+
     ;; This makes the Groups modules very chatty on the console.
     ; DebugEnabled = false
 
@@ -1004,6 +1019,7 @@
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
 
+
 [InterestManagement]
      ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
      ;; This section controls how state updates are prioritized for each client
@@ -1022,10 +1038,19 @@
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
 
+
 [Terrain]
     ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
     ; InitialTerrain = "pinhead-island"
 
+
+[UserProfiles]
+  ;# {ProfileServiceURL} {} {Set url to UserProfilesService} {}
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; ProfileServiceURL = http://127.0.0.1:8002
+
+
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
     ;; Uncomment one of the following includes as required.  For instance, to create a standalone OpenSim,