Merge branch 'master' into newmultiattach

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

6 files changed, 142 insertions, 10 deletions

diff --git a/bin/HttpServer_OpenSim.dll b/bin/HttpServer_OpenSim.dll
index fd7ad74..e15493d 100755
--- a/bin/HttpServer_OpenSim.dll
+++ b/bin/HttpServer_OpenSim.dll
diff --git a/bin/HttpServer_OpenSim.pdb b/bin/HttpServer_OpenSim.pdb
index f56e891..cfff9a7 100644
--- a/bin/HttpServer_OpenSim.pdb
+++ b/bin/HttpServer_OpenSim.pdb
diff --git a/bin/HttpServer_OpenSim.xml b/bin/HttpServer_OpenSim.xml
index fa88fc7..61c3ad8 100644
--- a/bin/HttpServer_OpenSim.xml
+++ b/bin/HttpServer_OpenSim.xml
@@ -1669,6 +1669,65 @@
             A header have been received.

             </summary>

         </member>

+        <member name="T:HttpServer.LocklessQueue`1">

+            <summary>

+            A thread-safe lockless queue that supports multiple readers and 

+            multiple writers

+            </summary>

+        </member>

+        <member name="F:HttpServer.LocklessQueue`1.head">

+            <summary>Queue head</summary>

+        </member>

+        <member name="F:HttpServer.LocklessQueue`1.tail">

+            <summary>Queue tail</summary>

+        </member>

+        <member name="F:HttpServer.LocklessQueue`1.count">

+            <summary>Queue item count</summary>

+        </member>

+        <member name="M:HttpServer.LocklessQueue`1.#ctor">

+            <summary>

+            Constructor

+            </summary>

+        </member>

+        <member name="M:HttpServer.LocklessQueue`1.Enqueue(`0)">

+            <summary>

+            Enqueue an item

+            </summary>

+            <param name="item">Item to enqeue</param>

+        </member>

+        <member name="M:HttpServer.LocklessQueue`1.TryDequeue(`0@)">

+            <summary>

+            Try to dequeue an item

+            </summary>

+            <param name="item">Dequeued item if the dequeue was successful</param>

+            <returns>True if an item was successfully deqeued, otherwise false</returns>

+        </member>

+        <member name="P:HttpServer.LocklessQueue`1.Count">

+            <summary>Gets the current number of items in the queue. Since this

+            is a lockless collection this value should be treated as a close

+            estimate</summary>

+        </member>

+        <member name="T:HttpServer.LocklessQueue`1.SingleLinkNode">

+            <summary>

+            Provides a node container for data in a singly linked list

+            </summary>

+        </member>

+        <member name="F:HttpServer.LocklessQueue`1.SingleLinkNode.Next">

+            <summary>Pointer to the next node in list</summary>

+        </member>

+        <member name="F:HttpServer.LocklessQueue`1.SingleLinkNode.Item">

+            <summary>The data contained by the node</summary>

+        </member>

+        <member name="M:HttpServer.LocklessQueue`1.SingleLinkNode.#ctor">

+            <summary>

+            Constructor

+            </summary>

+        </member>

+        <member name="M:HttpServer.LocklessQueue`1.SingleLinkNode.#ctor(`0)">

+            <summary>

+            Constructor

+            </summary>

+        </member>

         <member name="T:HttpServer.IHttpRequest">

             <summary>

             Contains server side HTTP request information.

@@ -2825,6 +2884,11 @@
             <param name="protocol">Kind of HTTPS protocol. Usually TLS or SSL.</param>

             <returns>A created <see cref="T:HttpServer.IHttpClientContext"/>.</returns>

         </member>

+        <member name="M:HttpServer.IHttpContextFactory.Shutdown">

+            <summary>

+            Server is shutting down so shut down the factory

+            </summary>

+        </member>

         <member name="E:HttpServer.IHttpContextFactory.RequestReceived">

             <summary>

             A request have been received from one of the contexts.

@@ -2876,6 +2940,11 @@
             A creates <see cref="T:HttpServer.IHttpClientContext"/>.

             </returns>

         </member>

+        <member name="M:HttpServer.HttpContextFactory.Shutdown">

+            <summary>

+            Server is shutting down so shut down the factory

+            </summary>

+        </member>

         <member name="P:HttpServer.HttpContextFactory.UseTraceLogs">

             <summary>

              True if detailed trace logs should be written.

@@ -4315,6 +4384,58 @@
             </summary>

             <param name="message">message describing the error</param>

         </member>

+        <member name="T:HttpServer.ContextTimeoutManager">

+            <summary>

+            Timeout Manager.   Checks for dead clients.  Clients with open connections that are not doing anything.   Closes sessions opened with keepalive.

+            </summary>

+        </member>

+        <member name="M:HttpServer.ContextTimeoutManager.ProcessContextTimeouts">

+            <summary>

+            Causes the watcher to immediately check the connections. 

+            </summary>

+        </member>

+        <member name="M:HttpServer.ContextTimeoutManager.EnvironmentTickCount">

+            <summary>

+            Environment.TickCount is an int but it counts all 32 bits so it goes positive

+            and negative every 24.9 days. This trims down TickCount so it doesn't wrap

+            for the callers. 

+            This trims it to a 12 day interval so don't let your frame time get too long.

+            </summary>

+            <returns></returns>

+        </member>

+        <member name="M:HttpServer.ContextTimeoutManager.EnvironmentTickCountSubtract(System.Int32,System.Int32)">

+            <summary>

+            Environment.TickCount is an int but it counts all 32 bits so it goes positive

+            and negative every 24.9 days. Subtracts the passed value (previously fetched by

+            'EnvironmentTickCount()') and accounts for any wrapping.

+            </summary>

+            <param name="newValue"></param>

+            <param name="prevValue"></param>

+            <returns>subtraction of passed prevValue from current Environment.TickCount</returns>

+        </member>

+        <member name="M:HttpServer.ContextTimeoutManager.EnvironmentTickCountAdd(System.Int32,System.Int32)">

+            <summary>

+            Environment.TickCount is an int but it counts all 32 bits so it goes positive

+            and negative every 24.9 days. Subtracts the passed value (previously fetched by

+            'EnvironmentTickCount()') and accounts for any wrapping.

+            </summary>

+            <param name="newValue"></param>

+            <param name="prevValue"></param>

+            <returns>subtraction of passed prevValue from current Environment.TickCount</returns>

+        </member>

+        <member name="M:HttpServer.ContextTimeoutManager.EnvironmentTickCountSubtract(System.Int32)">

+            <summary>

+            Environment.TickCount is an int but it counts all 32 bits so it goes positive

+            and negative every 24.9 days. Subtracts the passed value (previously fetched by

+            'EnvironmentTickCount()') and accounts for any wrapping.

+            </summary>

+            <returns>subtraction of passed prevValue from current Environment.TickCount</returns>

+        </member>

+        <member name="T:HttpServer.ContextTimeoutManager.MonitorType">

+            <summary>

+            Use a Thread or a Timer to monitor the ugly

+            </summary>

+        </member>

         <member name="T:HttpServer.Sessions.MemorySessionStore">

             <summary>

             Session store using memory for each session.

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index eab1fce..ce2e600 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -210,13 +210,12 @@
     ;; Choose one of the physics engines below
     ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine
     ;; OpenDynamicsEngine is by some distance the most developed physics engine
-    ;; BulletSim is incomplete and experimental but in active development.  BulletSimN is a purely C# version of BulletSim.
+    ;; BulletSim is experimental and in active development.
     ;; basicphysics effectively does not model physics at all, making all
     ;; objects phantom.   
     ;; Default is OpenDynamicsEngine
     ; physics = OpenDynamicsEngine
     ; physics = BulletSim
-    ; physics = BulletSimN
     ; physics = basicphysics
     ; physics = POS
 
@@ -542,6 +541,13 @@
     ; shout_distance = 100
 
 
+[EntityTransfer]
+    ;# {DisableInterRegionTeleportCancellation} {} {Determine whether the cancel button is shown at all during teleports.} {false true} false
+    ;; This option exists because cancelling at certain points can result in an unuseable session (frozen avatar, etc.)
+    ;; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed.
+    ;DisableInterRegionTeleportCancellation = false
+
+
 [Messaging]
     ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
     ;; Module to handle offline messaging. The core module requires an external
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 417150a..1d2c0cf 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -628,6 +628,11 @@
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
 
+    ; Determine whether the cancel button is shown at all during teleports.
+    ; This option exists because cancelling at certain points can result in an unuseable session (frozen avatar, etc.)
+    ; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed.
+    DisableInterRegionTeleportCancellation = false
+
 
 [Messaging]
     ; Control which region module is used for instant messaging.
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 7746ebc..581c31d 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -26,12 +26,12 @@
         ; Set path to directory for plugin registry. Information
         ; about the registered repositories and installed plugins
         ; will be stored here
-        ; The Robust.exe process must hvae R/W access to the location 
+        ; The Robust.exe process must have R/W access to the location 
         RegistryLocation = "."
 
         ; Modular configurations
         ; Set path to directory for modular ini files...
-        ; The Robust.exe process must hvae R/W access to the location 
+        ; The Robust.exe process must have R/W access to the location 
         ConfigDirectory = "/home/opensim/etc/Configs"
 
 [ServiceList]
@@ -171,7 +171,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
         ;; Allow Hyperlinks to be created at the console
     HypergridLinker = true
 
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+        ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
         ; GatekeeperURI = "http://127.0.0.1:8002"
 
 
@@ -326,7 +326,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; HasProxy = false
     
     ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
-        ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+        ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
         ; GatekeeperURI = "http://127.0.0.1:8002"
 
     SRV_HomeURI = "http://127.0.0.1:8002"
@@ -436,7 +436,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
     ; how does the outside world reach me? This acts as public key too.
-        ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+        ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "http://127.0.0.1:8002"
 
     ; Does this grid allow incoming links to any region in it? 
@@ -531,7 +531,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
         UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
         AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
-        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ;; Can overwrite the default in [Hypergrid], but probably shouldn't
         ; HomeURI = "http://127.0.0.1:8002"
 
 ; * The interface that local users get when they are in other grids.
@@ -542,7 +542,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
-        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ;; Can overwrite the default in [Hypergrid], but probably shouldn't
         ; HomeURI = "http://127.0.0.1:8002"
 
     ;; The asset types that this grid can export to / import from other grids.
@@ -583,7 +583,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
     ;; What is the HomeURI of users associated with this grid?
-        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ;; Can overwrite the default in [Hypergrid], but probably shouldn't
         ; HomeURI = "http://127.0.0.1:8002"