Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-04 | 2 | -2/+3 |
|\ | |||||
| * | 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. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-07-02 | 7 | -46/+26 |
| |\ | |||||
| | * | Clean up IMoneyModule and adjust the other modules to the changes | Melanie Thielker | 2010-07-02 | 4 | -20/+19 |
| | | | |||||
| | * | Remove GetEconomyData and the economy data structure (unused) | Melanie Thielker | 2010-07-02 | 1 | -21/+0 |
| | | | |||||
| | * | Fox another scripting nasty. Stuff no system.string objects into lists | Melanie Thielker | 2010-07-02 | 1 | -1/+1 |
| | | | |||||
| | * | 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 | ||||
| * | | | Use SendTransferAbort in a more sensible place | Tom Grimshaw | 2010-07-03 | 1 | -8/+8 |
| | | | | |||||
* | | | | 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. | ||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-07-03 | 10 | -52/+41 |
|\ \ \ | | | | | | | | | | | | | 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 | 4 | -20/+19 |
| | | | | |||||
| * | | | Remove GetEconomyData and the economy data structure (unused) | Melanie Thielker | 2010-07-02 | 1 | -21/+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 | 2 | -4/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | 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 |
| | | |/ | |||||
| | | * | 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.. | ||||
* | | ANother stab at LSL compatibility | Melanie Thielker | 2010-07-01 | 2 | -2/+2 |
| | | |||||
* | | Remove trailing slash from HTTP URLs to be compatible with SL | Melanie Thielker | 2010-07-01 | 1 | -1/+1 |
| | | |||||
* | | Avoid a spurious error message when taking a friend's no copy item | Melanie Thielker | 2010-07-01 | 2 | -11/+38 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 7 | -23/+58 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-30 | 1 | -31/+8 |
| |\ | |||||
| | * | Revert "stop exceptions in setting and getting state from propogating since ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -31/+8 |
| | | | | | | | | | | | | | | | | | | they aren't fatal to operations" This reverts commit 94cb6fc916e1bd039f2b59214e68a0b3c4847445. | ||||
| * | | Fix scripts in rezzed objects not starting (Mantis #4775) | Melanie | 2010-06-30 | 1 | -0/+5 |
| |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-29 | 1 | -1/+2 |
| |\ | |||||
| | * | Remove the override from DeletToInventory in HGInventoryAccessModule. This ↵ | Diva Canto | 2010-06-29 | 1 | -1/+2 |
| | | | | | | | | | | | | may be causing the infinite loop, not sure. | ||||
| * | | Fix the XML serializationt to provide an empty script state element if | Melanie | 2010-06-29 | 1 | -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/opensim | Melanie | 2010-06-29 | 7 | -42/+114 |
| |\ | |||||
| | * | stop exceptions in setting and getting state from propogating since they ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -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-29 | 1 | -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 Canto | 2010-06-29 | 1 | -70/+70 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-29 | 1 | -18/+71 |
| | |\ | |||||
| | | * | Thanks Micheil Merlin for Mantis #4784: [PATCH] llRotBetween does not return ↵ | dahlia | 2010-06-28 | 1 | -18/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | correct rotations for a 180 degree angle between vectors Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
| | * | | Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG ↵ | Diva Canto | 2010-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase". | ||||
| | * | | Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken ↵ | Diva Canto | 2010-06-29 | 2 | -12/+3 |
| | |/ | | | | | | | | | | comments in InventoryAccessModule. | ||||
| | * | One more bug fix in FriendsModule: GrantRights. One of the caches was not ↵ | Diva Canto | 2010-06-28 | 1 | -0/+7 |
| | | | | | | | | | | | | being updated. | ||||
| * | | Fix a nullref on autoreturn | Melanie | 2010-06-29 | 1 | -5/+17 |
| |/ | |||||
| * | Change the way IRegionModule us referenced by IEmailModule to | Melanie Thielker | 2010-06-28 | 2 | -2/+2 |
| | | | | | | | | allow later conversion to new style | ||||
| * | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never | Melanie Thielker | 2010-06-28 | 4 | -6/+6 |
| | | | | | | | | used, but made for a very mispleading read of the code in the callers. | ||||
| * | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and | Melanie Thielker | 2010-06-28 | 3 | -20/+6 |
| | | | | | | | | | | | | | | nonworking ownership assignment in SOG, which messed things up before. No longer trust the client to send the ID of the person something is copied as, since it allows to run a script with someone else's permissions. Properly adjust inventory ownership and perms. | ||||
| * | Make drag copy and copy-on-ray handle friends list perms properly | Melanie Thielker | 2010-06-27 | 1 | -0/+22 |
| | | |||||
| * | Fix more perms weirdness. Preserve "Locked" status across gives and rez/take. | Melanie | 2010-06-27 | 1 | -8/+9 |
| | | | | | | | | Preserve "Anyone can move" flag in most cases. | ||||
* | | Comment the "Notecard saved" notification that pops up when a notecard | Melanie Thielker | 2010-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | is saved into a prim. Sl doesn't have it, and for good reason: It also happens on scripts in our version. Which is wrong. Better no message than a wrong one. |