| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 4 | -21/+9 |
|\ |
|
| * | Implement XMLRPCAdmin command admin_teleport_agent. | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -2/+2 |
| * | Stop also adding an ordinary http handler when we set up a poll http handler. | Justin Clark-Casey (justincc) | 2011-12-07 | 3 | -19/+7 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 12 | -15/+210 |
|\ \
| |/ |
|
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ... | Justin Clark-Casey (justincc) | 2011-12-05 | 12 | -15/+210 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 3 | -51/+80 |
|\ \
| |/ |
|
| * | Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() | Justin Clark-Casey (justincc) | 2011-12-03 | 2 | -4/+0 |
| * | Improve locking in AgentCircuitManager | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -25/+41 |
| * | Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionar... | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -37/+54 |
* | | Implement ChangeInventoryItemFlagsPacket handling | Melanie | 2011-12-04 | 1 | -0/+2 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 1 | -15/+48 |
|\ \
| |/ |
|
| * | On "show caps", stop excluding the seed cap but do exclude it elsewhere | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+3 |
| * | With "debug http 1", show the path with the query string instead of just the ... | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -21/+21 |
| * | Add "debug http" command for currently simple extra debug logging of non-even... | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -12/+43 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 3 | -59/+2 |
|\ \
| |/ |
|
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-25 | 2 | -2/+2 |
| * | Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conv... | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -57/+0 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 1 | -3/+19 |
|\ \
| |/ |
|
| * | Stop an exception being thrown and a teleport/border cross failing if the des... | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -3/+19 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff... | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 5 | -276/+35 |
|\ \
| |/ |
|
| * | fix build break on UserManagementModule. | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -8/+15 |
| * | improve formatting of "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+8 |
| * | send a watchdog heartbeat for a poll worker thread when it's actually run | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -0/+3 |
| * | Add number of milliseconds since last update to "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -4/+18 |
| * | Remove unused RegionCommsListener/IRegionCommsListener. | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -272/+0 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-12 | 1 | -2/+3 |
|\ \
| |/ |
|
| * | doh - correct build break | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -6/+7 |
| * | Add threads to the watchdog thread list before we start them. | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -5/+5 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -8/+6 |
|\ \
| |/ |
|
| * | Remove unused avariable in PollServiceRequestManager | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -8/+6 |
| * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -24/+12 |
|\ \
| |/ |
|
| * | Fix avatar height, removes the hip offset hack | nebadon | 2011-11-05 | 1 | -24/+12 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -8/+0 |
|\ \
| |/ |
|
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 15 | -80/+330 |
|\ \
| |/ |
|
| * | Restart the event queue worker threads that I accidentally disabled earlier t... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -9/+11 |
| * | In Watchdog, add ability to specific timeout for a thread. | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -16/+56 |
| * | Add m_threads dictionary locking to Watchdog.GetThreads() | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -1/+2 |
| * | minor: add "threads show" as synonym for "show threads" for consistency | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+5 |
| * | Add "threads abort <thread-id>" simulator console command that allows us to a... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -2/+48 |
| * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o... | Justin Clark-Casey (justincc) | 2011-10-25 | 13 | -64/+212 |
* | | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+2 |
|\ \
| |/ |
|
| * | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -12/+2 |
* | | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+9 |
|\ \
| |/ |
|
| * | Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS... | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -5/+9 |
* | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+6 |
|\ \
| |/ |
|
| * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -5/+6 |
* | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|