aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-191-1/+1
|\
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff...Justin Clark-Casey (justincc)2011-11-191-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-175-276/+35
|\ \ | |/
| * fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-152-8/+15
| * improve formatting of "show threads"Justin Clark-Casey (justincc)2011-11-151-1/+8
| * send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)2011-11-151-0/+3
| * Add number of milliseconds since last update to "show threads"Justin Clark-Casey (justincc)2011-11-152-4/+18
| * Remove unused RegionCommsListener/IRegionCommsListener.Justin Clark-Casey (justincc)2011-11-152-272/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-121-2/+3
|\ \ | |/
| * doh - correct build breakJustin Clark-Casey (justincc)2011-11-121-6/+7
| * Add threads to the watchdog thread list before we start them.Justin Clark-Casey (justincc)2011-11-121-5/+5
* | Merge branch 'master' into bigmergeMelanie2011-11-101-8/+6
|\ \ | |/
| * Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-051-24/+12
|\ \ | |/
| * Fix avatar height, removes the hip offset hacknebadon2011-11-051-24/+12
* | Merge branch 'master' into bigmergeMelanie2011-10-261-8/+0
|\ \ | |/
* | Merge branch 'master' into bigmergeMelanie2011-10-2615-80/+330
|\ \ | |/
| * Restart the event queue worker threads that I accidentally disabled earlier t...Justin Clark-Casey (justincc)2011-10-252-9/+11
| * In Watchdog, add ability to specific timeout for a thread.Justin Clark-Casey (justincc)2011-10-251-16/+56
| * Add m_threads dictionary locking to Watchdog.GetThreads()Justin Clark-Casey (justincc)2011-10-251-1/+2
| * minor: add "threads show" as synonym for "show threads" for consistencyJustin Clark-Casey (justincc)2011-10-251-0/+5
| * Add "threads abort <thread-id>" simulator console command that allows us to a...Justin Clark-Casey (justincc)2011-10-252-2/+48
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-2513-64/+212
* | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmergeMelanie2011-10-251-12/+2
|\ \ | |/
| * Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)2011-10-241-12/+2
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-252-5/+9
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS...Justin Clark-Casey (justincc)2011-10-242-5/+9
* | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-252-5/+6
|\ \ | |/
| * Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-222-5/+6
* | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w...Justin Clark-Casey (justincc)2011-10-171-2/+2
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-251-5/+0
|\ \ | |/
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t...Justin Clark-Casey (justincc)2011-10-151-5/+0
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-251-5/+2
|\ \ | |/
| * fetch physical_prim switch from [Startup] config from inside scene, as is don...Justin Clark-Casey (justincc)2011-10-151-5/+2
* | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmergeMelanie2011-10-251-0/+6
|\ \ | |/
| * Restore [Startup] physical_prim flag which can stop any prims being subject t...Justin Clark-Casey (justincc)2011-10-151-0/+6
* | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmergeMelanie2011-10-251-1/+8
|\ \ | |/
| * refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s...Justin Clark-Casey (justincc)2011-10-141-1/+8
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-252-38/+0
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-122-38/+0
* | Adjust CM version tagMelanie2011-10-121-1/+1
* | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * flip master version up to 0.7.3Justin Clark-Casey (justincc)2011-10-071-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-031-2/+1
| |\
* | \ Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmergeMelanie2011-10-111-3/+0
|\ \ \ | |/ /
| * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-031-3/+0
* | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmergeMelanie2011-10-111-2/+1
|\ \ \ | | |/ | |/|
| * | Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-031-2/+1
| |/
generated by cgit v1.1 at 2024-11-05 11:24:00 +0000