Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster-presence-refactor' of ↵ | Mike Rieker | 2010-07-06 | 72 | -386/+936 |
|\ | | | | | | | www.3dhosting.de:/var/git/careminster into careminster-presence-refactor | ||||
| * | Undo fix is now complete. This commit repairs the special case of the root ↵ | Tom Grimshaw | 2010-07-05 | 3 | -15/+41 |
| | | | | | | | | prim moving or rotating independently of the rest of the group. | ||||
| * | Bring "Redo" up to date with "Undo" so it works too | Tom Grimshaw | 2010-07-05 | 1 | -31/+10 |
| | | |||||
| * | Fix single prim rotation undo. All UNDO functions are now working correctly ↵ | Tom Grimshaw | 2010-07-04 | 1 | -1/+1 |
| | | | | | | | | except for when the root prim is moved or rotated as a single prim (coming soon). | ||||
| * | Rotation undo fix and remove a debug chatter i missed. Still not working: ↵ | Tom Grimshaw | 2010-07-04 | 1 | -4/+3 |
| | | | | | | | | Individual child prim rotational undo and special cases where the root prim was moved or rotated (all the children then need to restore their offsets). Coming shortly. | ||||
| * | The majority of the Undo fix. There is still an issue with Rotation which ↵ | Tom Grimshaw | 2010-07-04 | 5 | -57/+135 |
| | | | | | | | | i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging. | ||||
| * | Correct positioning of timeout modifier in the SynchronousRestObjectRequester | Tom Grimshaw | 2010-07-04 | 1 | -1/+1 |
| | | |||||
| * | Add System.Core assembly reference to two projects so that TimeZoneInfo can ↵ | Tom Grimshaw | 2010-07-04 | 1 | -0/+2 |
| | | | | | | | | be used | ||||
| * | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-07-04 | 11 | -40/+115 |
| |\ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-04 | 7 | -5/+29 |
| | |\ | |||||
| | | * | Fixes the obvious problem in mantis #4841. Melanie needs to look at other ↵ | Diva Canto | 2010-07-04 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | potential problems there, though. | ||||
| | | * | Compiled Robust.32BitLaunch.exe to .Net 3.5 | Diva Canto | 2010-07-03 | 1 | -0/+0 |
| | | | | |||||
| | | * | Fixes mantis #4835 | Diva Canto | 2010-07-03 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-07-02 | 13 | -74/+57 |
| | | |\ | |||||
| | | | * | Clean up IMoneyModule and adjust the other modules to the changes | Melanie Thielker | 2010-07-02 | 6 | -26/+26 |
| | | | | | |||||
| | | | * | Remove GetEconomyData and the economy data structure (unused) | Melanie Thielker | 2010-07-02 | 2 | -42/+0 |
| | | | | | |||||
| | | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-07-02 | 1 | -0/+1 |
| | | | |\ | |||||
| | | | | * | add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784) | dahlia | 2010-07-01 | 1 | -0/+1 |
| | | | | | | |||||
| | | | * | | Fox another scripting nasty. Stuff no system.string objects into lists | Melanie Thielker | 2010-07-02 | 1 | -1/+1 |
| | | | |/ | |||||
| | | | * | Add MapTileURL to robust to supply the url needed by snowglobe | Melanie | 2010-07-02 | 3 | -2/+24 |
| | | | | | |||||
| | | | * | Fix a dumb little sign error that makes a LSL wiki example fail | Melanie Thielker | 2010-07-02 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Fixes mantis #4782 | Diva Canto | 2010-07-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-07-03 | 1 | -8/+8 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | | Fix IMs the right way. This sets it up so that timestamps are actually | Melanie Thielker | 2010-07-03 | 4 | -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. | ||||
| * | | | | | Check cached asset to make sure it contains data, and if not, re-request | Tom Grimshaw | 2010-07-04 | 1 | -3/+3 |
| | |/ / / | |/| | | | |||||
| * | | | | Use SendTransferAbort in a more sensible place | Tom Grimshaw | 2010-07-03 | 1 | -8/+8 |
| |/ / / | |||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-07-03 | 12 | -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's | Melanie Thielker | 2010-07-03 | 1 | -5/+5 |
| | | | | | |||||
| | * | | | Re-add the slashes at the end of the URL. Too much depends on them | Melanie Thielker | 2010-07-03 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Call client.Start() sunchronously. Calling thos async avoids some stuttering | Melanie Thielker | 2010-07-02 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | when people log in, but fatally screws up money. | ||||
| | * | | | Clean up IMoneyModule and adjust the other modules to the changes | Melanie Thielker | 2010-07-02 | 6 | -26/+26 |
| | | | | | |||||
| | * | | | Remove GetEconomyData and the economy data structure (unused) | Melanie Thielker | 2010-07-02 | 2 | -42/+0 |
| | | | | | |||||
| | * | | | Fox another scripting nasty. Stuff no system.string objects into lists | Melanie Thielker | 2010-07-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-07-02 | 3 | -7/+8 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | | * \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-02 | 2 | -4/+6 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Add region name on the end of script startup debug messages | Justin Clark-Casey (justincc) | 2010-07-01 | 1 | -2/+4 |
| | | | | | | |||||
| | | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-01 | 1 | -0/+5 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | minor: comment out high volume texture serving module debug message | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+2 |
| | | | | | | |||||
| | | | * | | minor: comment out high volume texture serving module debug message | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fix a dumb little sign error that makes a LSL wiki example fail | Melanie Thielker | 2010-07-02 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fix Undo! Made a lot of changes to Undo state saving; it now considers that ↵ | Tom Grimshaw | 2010-07-03 | 3 | -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 buggy | Tom Grimshaw | 2010-07-03 | 1 | -33/+18 |
| | | | | | | |||||
| * | | | | | Make sure the AssetServiceConnector times out within 30 seconds. If it ↵ | Tom Grimshaw | 2010-07-03 | 1 | -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 Grimshaw | 2010-07-03 | 1 | -1/+16 |
| | |/ / / | |/| | | | | | | | | | | | | | 100 seconds. | ||||
| * | | | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-07-01 | 3 | -4/+4 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | ANother stab at LSL compatibility | Melanie Thielker | 2010-07-01 | 3 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-07-01 | 1 | -0/+8 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | | Remove trailing slash from HTTP URLs to be compatible with SL | Melanie Thielker | 2010-07-01 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Cache all assets on upload so that the client can still retrieve the asset ↵ | Tom Grimshaw | 2010-07-01 | 1 | -3/+2 |
| | |/ / / | |/| | | | | | | | | | | | | | if it enters a retry queue | ||||
| * | | | | Fix build break | Tom Grimshaw | 2010-07-01 | 1 | -1/+1 |
| | | | | |