aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-07-047-5/+29
|\
| * Fixes the obvious problem in mantis #4841. Melanie needs to look at other pot...Diva Canto2010-07-041-1/+2
| * Compiled Robust.32BitLaunch.exe to .Net 3.5Diva Canto2010-07-031-0/+0
| * Fixes mantis #4835Diva Canto2010-07-031-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-07-0213-74/+57
| |\
| | * Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-026-26/+26
| | * Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-022-42/+0
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-07-021-0/+1
| | |\
| | | * add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784)dahlia2010-07-011-0/+1
| | * | Fox another scripting nasty. Stuff no system.string objects into listsMelanie Thielker2010-07-021-1/+1
| | |/
| | * Add MapTileURL to robust to supply the url needed by snowglobeMelanie2010-07-023-2/+24
| | * Fix a dumb little sign error that makes a LSL wiki example failMelanie Thielker2010-07-021-2/+2
| * | Fixes mantis #4782Diva Canto2010-07-021-1/+1
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-07-031-8/+8
|\ \ \
| * | | Use SendTransferAbort in a more sensible placeTom Grimshaw2010-07-031-8/+8
* | | | Fix IMs the right way. This sets it up so that timestamps are actuallyMelanie Thielker2010-07-034-35/+86
|/ / /
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-07-0312-78/+47
|\ \ \
| * | | Now, fix the slash issue the right way. Our URLs now work like SL'sMelanie Thielker2010-07-031-5/+5
| * | | Re-add the slashes at the end of the URL. Too much depends on themMelanie Thielker2010-07-031-2/+2
| * | | Call client.Start() sunchronously. Calling thos async avoids some stutteringMelanie Thielker2010-07-021-1/+10
| * | | Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-026-26/+26
| * | | Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-022-42/+0
| * | | Fox another scripting nasty. Stuff no system.string objects into listsMelanie Thielker2010-07-021-1/+1
| * | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-07-023-7/+8
| |\ \ \
| | * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-07-022-4/+6
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Add region name on the end of script startup debug messagesJustin Clark-Casey (justincc)2010-07-011-2/+4
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-07-011-0/+5
| | | |\ \ | | | | |/
| | | | * minor: comment out high volume texture serving module debug messageJustin Clark-Casey (justincc)2010-06-301-2/+2
| | | * | minor: comment out high volume texture serving module debug messageJustin Clark-Casey (justincc)2010-06-301-2/+2
| * | | | Fix a dumb little sign error that makes a LSL wiki example failMelanie Thielker2010-07-021-2/+2
* | | | | Fix Undo! Made a lot of changes to Undo state saving; it now considers that ...Tom Grimshaw2010-07-033-23/+87
* | | | | Re-implement the Undo stack as a List; the old implementation was buggyTom Grimshaw2010-07-031-33/+18
* | | | | Make sure the AssetServiceConnector times out within 30 seconds. If it doesn'...Tom Grimshaw2010-07-031-2/+2
* | | | | Implement a timeout value in the SynchronousRestObjectRequester. Default is 1...Tom Grimshaw2010-07-031-1/+16
| |/ / / |/| | |
* | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-07-013-4/+4
|\ \ \ \ | |/ / /
| * | | ANother stab at LSL compatibilityMelanie Thielker2010-07-013-3/+3
| * | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-07-011-0/+8
| |\ \ \
| * | | | Remove trailing slash from HTTP URLs to be compatible with SLMelanie Thielker2010-07-011-1/+1
* | | | | Cache all assets on upload so that the client can still retrieve the asset if...Tom Grimshaw2010-07-011-3/+2
| |/ / / |/| | |
* | | | Fix build breakTom Grimshaw2010-07-011-1/+1
* | | | Report asset upload success if it has previously failedTom Grimshaw2010-07-011-0/+4
* | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-07-0119-42/+179
|\ \ \ \ | |/ / /
| * | | Avoid a spurious error message when taking a friend's no copy itemMelanie Thielker2010-07-012-11/+38
| * | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-3018-31/+141
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-302-31/+12
| | |\ \ | | | |/
| | | * Removed opportunity for exception in BaseHttpServer. (mantis #4825)Diva Canto2010-06-301-0/+4
| | | * Revert "stop exceptions in setting and getting state from propogating since t...Justin Clark-Casey (justincc)2010-06-291-31/+8
| | * | Fix scripts in rezzed objects not starting (Mantis #4775)Melanie2010-06-301-0/+5
| | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-291-1/+2
| | |\
| | | * Remove the override from DeletToInventory in HGInventoryAccessModule. This ma...Diva Canto2010-06-291-1/+2