aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-152-29/+195
|\
| * Make the "debug http" command available for robust as well as the simulator. ...Justin Clark-Casey (justincc)2012-06-152-4/+59
| * Add main instance to internal MainServer.m_Servers list to simplify internal ...Justin Clark-Casey (justincc)2012-06-152-11/+61
| * When setting debug http level, do this for all known http servers, not just t...Justin Clark-Casey (justincc)2012-06-152-21/+40
| * Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpeci...Justin Clark-Casey (justincc)2012-06-151-4/+27
| * Shuffle "debug http" levels so that 1 and 2 now cause different levels of war...Justin Clark-Casey (justincc)2012-06-141-8/+27
* | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ | |/
| * Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752Justin Clark-Casey (justincc)2012-06-141-1/+1
* | Merge branch 'master' into careminsterMelanie2012-06-141-2/+0
|\ \ | |/
| * Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-131-2/+0
* | Merge branch 'master' into careminsterMelanie2012-06-135-313/+169
|\ \ | |/
| * Don't include time to transmit response back to requester when assessing slow...Justin Clark-Casey (justincc)2012-06-135-314/+169
* | Merge branch 'master' into careminsterMelanie2012-06-122-6/+20
|\ \ | |/
| * OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-121-0/+7
| * Set IClientAPI.IsActive = false early on client removal due to ack timeout ra...Justin Clark-Casey (justincc)2012-06-121-6/+3
| * In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already a...Justin Clark-Casey (justincc)2012-06-121-6/+16
* | Merge branch 'master' into careminsterMelanie2012-06-091-15/+2
|\ \ | |/
| * Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-081-15/+2
* | Merge branch 'master' into careminsterMelanie2012-06-073-18/+26
|\ \ | |/
| * Make change to fix Windows buildsBlueWall2012-06-071-1/+1
| * Allow the thread watchdog to accept an alarm method that is invoked if the ti...Justin Clark-Casey (justincc)2012-06-072-17/+25
* | Remove useless logging of a bare-names stack trace. It's meaninglessMelanie2012-06-061-32/+57
* | Merge branch 'master' into careminsterMelanie2012-05-273-146/+367
|\ \ | |/
| * adding status codes from rfc 6585SignpostMarv2012-05-241-2/+22
| * porting IDE tooltip-friendly documentation tweaks from Aurora-SimSignpostMarv2012-05-241-134/+223
| * refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTabl...Justin Clark-Casey (justincc)2012-05-231-9/+9
| * Add ConsoleDisplayList for more consistent formatting of console output in li...Justin Clark-Casey (justincc)2012-05-231-0/+112
| * refactor: rename ConsoleTable -> ConsoleDisplayTable for clarityJustin Clark-Casey (justincc)2012-05-231-2/+2
* | Merge branch 'master' into careminsterMelanie2012-05-143-3/+71
|\ \ | |/
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-143-3/+71
* | Merge branch 'avination' into careminsterMelanie2012-05-131-0/+3
|\ \
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with par...UbitUmarov2012-05-121-0/+3
* | | Merge branch 'master' into careminsterMelanie2012-05-131-0/+139
|\ \ \ | | |/ | |/|
| * | Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-123-71/+3
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-103-3/+71
| * | Add ConsoleTable framework class for future uniform formatting of console out...Justin Clark-Casey (justincc)2012-05-101-0/+139
* | | Merge branch 'master' into careminsterMelanie2012-05-101-2/+2
|\ \ \ | |/ /
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-05-081-19/+19
|\ \ \ | |/ /
| * | Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-05-071-19/+19
* | | Merge branch 'master' into careminsterMelanie2012-05-071-4/+8
|\ \ \ | |/ /
| * | add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O...dahlia2012-05-071-4/+8
* | | Merge branch 'avination' into careminsterMelanie2012-05-051-1/+24
|\ \ \ | | |/ | |/|
| * | Fix teleporting from older to newer regionsMelanie2012-05-041-1/+8
| * | Add the default animation to the child agent data updateMelanie2012-05-041-0/+11
| * | Clear permissions given to the object we stand up fromMelanie2012-05-031-1/+6
* | | Merge branch 'master' into careminsterMelanie2012-05-0511-119/+297
|\ \ \ | | |/ | |/|
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has c...Justin Clark-Casey (justincc)2012-05-051-3/+13
| * | Change LongCallTime on WebUtil to 3000, to match the time where request handl...Justin Clark-Casey (justincc)2012-05-041-1/+1
| * | minor: Tweak BaseHttpServer message to make it clear that this relates to slo...Justin Clark-Casey (justincc)2012-05-041-1/+1