aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-253-9/+15
|\
| * fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
| * Revert "Report http server onRequest() exception properly."Justin Clark-Casey (justincc)2010-06-251-1/+1
| * Report http server onRequest() exception properly.Justin Clark-Casey (justincc)2010-06-251-1/+1
| * minor: Move log information about SYSTEMIP to the place where it's resolvedJustin Clark-Casey (justincc)2010-06-251-7/+13
| * * SimianAssetServiceConnector Delete() was expecting the wrong type of respon...John Hurliman2010-06-241-1/+1
* | Make "Allow other residents to edit terrain" default to FALSETom Grimshaw2010-06-251-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-171-0/+7
|\ \ | |/
| * Force newly connecting remote consoles to display a promptMelanie2010-06-171-0/+7
| * Readjust master version and flavorMelanie2010-06-151-2/+2
| * Change flavor to 0.7-RC1Melanie2010-06-121-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
|\ \
| * | Change trunk versio to 0.7.1 DevMelanie2010-06-121-2/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-0/+2
|\ \ | |/
| * Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packetMelanie2010-06-121-0/+2
| * Make the text mode remote console really work. It can now be used to sendMelanie Thielker2010-06-081-14/+22
* | Make the text mode remote console really work. It can now be used to sendMelanie Thielker2010-06-081-14/+22
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-282-3/+16
|\ \ | |/
| * If a command has descriptive help, add a line above and below the print out f...Justin Clark-Casey (justincc)2010-05-281-0/+10
| * Add ability to load IARs directly from URIsJustin Clark-Casey (justincc)2010-05-281-2/+1
| * add a smidgen more log debug information in the form of the operating system ...Justin Clark-Casey (justincc)2010-05-281-1/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-231-0/+1
|\ \ | |/
| * Added overload of SendGenericMessage to LLClientView with string list as para...Mikko Pallari2010-05-211-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-214-13/+49
|\ \ | |/
| * * Moving all of the prioritization/reprioritization code into a new file Prio...John Hurliman2010-05-212-12/+10
| * make oar object filename/pathname creation a helper methodJustin Clark-Casey (justincc)2010-05-211-0/+33
| * add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-211-1/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-214-218/+318
|\ \ | |/
| * Merging slimupdates2unknown2010-05-203-217/+314
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupd...unknown2010-05-151-48/+0
| | |\
| | * | * Initial commit of the slimupdates2 rewrite. This pass maintains the origina...unknown2010-05-123-217/+314
| * | | Change appender to deal with line feeds more intelligently.Melanie2010-05-191-1/+4
| * | | Clean up output a bitMelanie2010-05-191-1/+1
* | | | Fix for hanging on "Connecting to region".. caused by packets being processed...Tom Grimshaw2010-05-181-0/+1
* | | | When killing a zombie session, don't send the stop packet since it often has ...Tom Grimshaw2010-05-171-0/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-161-1/+1
|\ \ \ \ | |/ / /
| * | | Prevent a crash when the two agent dictionaries get out of syncMelanie2010-05-161-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-164-50/+38
|\ \ \ \ | |/ / /
| * | | Finalized the client's TCP IP address verification process for HG1.5.Diva Canto2010-05-153-2/+38
| | |/ | |/|
| * | delete now unused MessageServerInfoJustin Clark-Casey (justincc)2010-05-151-48/+0
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-101-4/+4
|\ \ | |/
| * * Fixed spamming the assets table with map tiles. The tile image ID is now st...Diva Canto2010-05-091-4/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-091-0/+22
|\ \ | |/
| * Add a field asset_flags and a corresponding enum to the asset database. ThisMelanie2010-05-091-0/+22
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-061-6/+10
|\ \ | |/
| * * Fixes LandDataSerializerTests on Windows by stripping CR from the serializa...Teravus Ovares (Dan Olivares)2010-05-051-6/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-051-0/+37
|\ \ | |/
| * Plumb the viewer version string through into AgentCircuitData. Now all thatMelanie Thielker2010-05-051-0/+11
| * * Added an important comment to warn people not to use MockConsole for anythi...Teravus Ovares (Dan Olivares)2010-05-041-0/+5
| * * This should fix the tests failing because of a MainConsole.Instance null re...Teravus Ovares (Dan Olivares)2010-05-041-0/+32