aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-03-0315-59/+122
|\
| * Make Keyframe motion cross regions againMelanie2013-03-032-2/+4
| * Make a viewer sent XML error prettierMelanie2013-03-031-0/+4
| * Reinstate uploading temporary texturesMelanie2013-02-271-4/+4
| * Try to update inventory items when there is a valid asset - may fix temp text...Melanie2013-02-271-0/+5
| * Remove osParseJSONNew because it's "object" return type is not useful for LSLroot2013-02-253-7/+1
| * Make banking no longer break sit rotations. Fix spinning avatars.Melanie2013-02-251-3/+6
| * Revert "Output some additional data on Vivox connection errors", this logs pa...Melanie2013-02-241-1/+1
| * Output some additional data on Vivox connection errorsMelanie2013-02-241-1/+1
| * The viewer tries to parse the error message body to LLSD - give it some.Melanie2013-02-241-2/+2
| * Revert "Allow TeleportCancel packets to reset the transfer state machine"Melanie2013-02-241-6/+0
| * Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-185-34/+81
| * Correctly remove https:// URLs from the http server.Melanie2013-02-171-1/+7
| * Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
* | Merge branch 'master' into careminsterMelanie2013-03-0111-59/+126
|\ \
| * | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ...Diva Canto2013-03-012-23/+36
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-014-15/+63
| |\ \
| | * | BulletSim: more things into the TODO list.Robert Adams2013-03-011-1/+6
| | * | BulletSim: add parameters, code cleanup around checking and enforcingRobert Adams2013-03-013-14/+57
| * | | Add the Mono AddinDependency attribute to the example region modules.Justin Clark-Casey (justincc)2013-03-012-2/+4
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-011-19/+15
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-289-43/+366
| | |\ \
| | * | | Bug fix in DataSnapshot, where a var was being used before being initialized.Diva Canto2013-02-281-19/+15
| * | | | minor: Log location in which simulator/robust was started.Justin Clark-Casey (justincc)2013-02-282-0/+8
| | |/ / | |/| |
* | | | Merge branch 'master' into careminsterMelanie2013-02-2831-94/+478
|\ \ \ \ | |/ / /
| * | | Fix potential concurrency issue since the LSL notecard cache was not being ch...Justin Clark-Casey (justincc)2013-02-281-7/+10
| * | | Fix bug where simultaneous calls by different scripts to llGetNotecardLine() ...Justin Clark-Casey (justincc)2013-02-281-12/+14
| * | | Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-288-24/+342
| |/ /
| * | Removed duplicate 'using' statement.Diva Canto2013-02-271-1/+0
| * | Switched to using the other Util function with a default value.Diva Canto2013-02-2712-14/+28
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-2735-295/+705
| |\ \
| | * | Add comment to example region modules about need to add Assembly annotation i...Justin Clark-Casey (justincc)2013-02-272-0/+10
| | * | Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-273-18/+13
| | * | Get "show modules" console command to show modules in alphabetical order, and...Justin Clark-Casey (justincc)2013-02-271-7/+20
| | * | Add asset name and description truncation warnings to SQLite database plugin ...Justin Clark-Casey (justincc)2013-02-271-5/+23
| | * | Add more information to warnings logged when asset names and descriptions hav...Justin Clark-Casey (justincc)2013-02-273-6/+18
| * | | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-2712-14/+14
* | | | Merge branch 'master' into careminsterMelanie2013-02-275-13/+273
|\ \ \ \ | | |/ / | |/| |
| * | | minor: remove some mono compiler warnings in script regression testsJustin Clark-Casey (justincc)2013-02-272-2/+1
| * | | Show http poll handlers in separate http (poll) section of "show http-handler...Justin Clark-Casey (justincc)2013-02-271-2/+5
| * | | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-272-9/+266
* | | | Merge branch 'master' into careminsterMelanie2013-02-2720-216/+301
|\ \ \ \ | |/ / /
| * | | Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-2714-212/+245
| * | | minor: remove warning in ConfigurationLoaderTestJustin Clark-Casey (justincc)2013-02-261-0/+2
| * | | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-264-22/+84
| * | | BulletSim: fix crash around race condition when a mesh asset cannotRobert Adams2013-02-262-8/+12
* | | | Merge branch 'master' into careminsterMelanie2013-02-2616-269/+708
|\ \ \ \ | |/ / /
| * | | BulletSim: tweeks to make avatar jump work better.Robert Adams2013-02-251-4/+6
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-256-39/+56
| |\ \
| | * | Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-256-39/+56