aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-07-044-5/+25
|\
| * Fixes the obvious problem in mantis #4841. Melanie needs to look at other ↵Diva Canto2010-07-041-1/+2
| | | | | | | | potential problems there, though.
| * Fixes mantis #4835Diva Canto2010-07-031-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-07-0211-74/+53
| |\
| | * 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
| | |
| | * Add MapTileURL to robust to supply the url needed by snowglobeMelanie2010-07-022-2/+21
| | |
| | * 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 ↵Melanie Thielker2010-07-031-8/+8
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | 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
|/ / / | | | | | | | | | | | | | | | | | | | | | in PST (to match viewer time), does correct storage and retrieval of IMs, corrects the session ID and makes sure IMs don't get marked "saved" if they're live. Removes the group IM save option, which our group IM module never had in the first place, as saving group chatter makes no sense at all.
* | | Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-07-0312-78/+47
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | 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
| | | | | | | | | | | | | | | | when people log in, but fatally screws up money.
| * | | 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 ↵Melanie Thielker2010-07-023-7/+8
| |\ \ \ | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| | * \ \ 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
| | | |/
| | | * 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
| | | | | | | | | | | | | | | | groups of objects can be moved and not just individual prims..
* | | | 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 ↵Tom Grimshaw2010-07-031-2/+2
| | | | | | | | | | | | | | | | doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue.
* | | | Implement a timeout value in the SynchronousRestObjectRequester. Default is ↵Tom Grimshaw2010-07-031-1/+16
| |/ / |/| | | | | | | | 100 seconds.
* | | Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-07-013-4/+4
|\ \ \ | |/ / | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | ANother stab at LSL compatibilityMelanie Thielker2010-07-013-3/+3
| | |
| * | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-07-011-0/+8
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | 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 ↵Tom Grimshaw2010-07-011-3/+2
| |/ / |/| | | | | | | | if it enters a retry queue
* | | 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 ↵Tom Grimshaw2010-07-0116-42/+170
|\ \ \ | |/ / | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | 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-3015-31/+132
| |\ \ | | |/
| | * 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 ↵Justin Clark-Casey (justincc)2010-06-291-31/+8
| | | | | | | | | | | | | | | | | | | | | | | | they aren't fatal to operations" This reverts commit 94cb6fc916e1bd039f2b59214e68a0b3c4847445.
| | * | 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 ↵Diva Canto2010-06-291-1/+2
| | | | | | | | | | | | | | | | may be causing the infinite loop, not sure.
| | * | Fix the XML serializationt to provide an empty script state element ifMelanie2010-06-291-4/+28
| | |/ | | | | | | | | | the script hasn't yet saved state, or can't save state because of a loop
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-2911-46/+133
| | |\
| | | * stop exceptions in setting and getting state from propogating since they ↵Justin Clark-Casey (justincc)2010-06-291-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | aren't fatal to operations this will hopefully stop "save oar" from failing if a script asset is corrupt
| | | * Revert "don't report the null uuid as a missing asset on saving oars/iars"Justin Clark-Casey (justincc)2010-06-291-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea. This change led to infinite timeout since the expected number of assets no longer matched requests. Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient
| | | * This file wants to be committed.Diva Canto2010-06-291-70/+70
| | | |
generated by cgit v1.1 at 2024-11-12 16:53:54 +0000