aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-104-15/+9
|\
| * minor: comment out "unpacked appearance" log mesasge for nowJustin Clark-Casey (justincc)2011-12-091-1/+1
| * Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.Justin Clark-Casey (justincc)2011-12-091-1/+1
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ...Justin Clark-Casey (justincc)2011-12-092-13/+7
* | Merge branch 'master' into bigmergeMelanie2011-12-092-19/+30
|\ \ | |/
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-081-16/+29
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-081-3/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-083-3/+81
|\ \ | |/
| * On a new client circuit, send the initial reply ack to let the client know it...Justin Clark-Casey (justincc)2011-12-083-3/+81
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-084-21/+9
|\ \ | |/
| * Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-071-2/+2
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-073-19/+7
* | Merge branch 'master' into bigmergeMelanie2011-12-0512-15/+210
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-0512-15/+210
* | Merge branch 'master' into bigmergeMelanie2011-12-053-51/+80
|\ \ | |/
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-032-4/+0
| * Improve locking in AgentCircuitManagerJustin Clark-Casey (justincc)2011-12-031-25/+41
| * Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionar...Justin Clark-Casey (justincc)2011-12-031-37/+54
* | Implement ChangeInventoryItemFlagsPacket handlingMelanie2011-12-041-0/+2
* | Merge branch 'master' into bigmergeMelanie2011-12-011-15/+48
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+3
| * With "debug http 1", show the path with the query string instead of just the ...Justin Clark-Casey (justincc)2011-11-291-21/+21
| * Add "debug http" command for currently simple extra debug logging of non-even...Justin Clark-Casey (justincc)2011-11-291-12/+43
* | Merge branch 'master' into bigmergeMelanie2011-11-283-59/+2
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-252-2/+2
| * Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conv...Justin Clark-Casey (justincc)2011-11-251-57/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-241-3/+19
|\ \ | |/
| * Stop an exception being thrown and a teleport/border cross failing if the des...Justin Clark-Casey (justincc)2011-11-221-3/+19
* | 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
generated by cgit v1.1 at 2024-11-14 15:51:32 +0000