Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 1 | -1/+41 | |
| |\ \ | | |/ | ||||||
| | * | Add saving assets from gestures to IAR | Melanie | 2009-12-23 | 1 | -1/+41 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2009-12-23 | 1 | -29/+85 | |
| |\ \ | | | | | | | | | | | | | careminster | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 5 | -3/+28 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-23 | 5 | -3/+23 | |
| | |\ \ | ||||||
| | | * | | Thank you kindly, Ziah for a patch that adds the channel to the class ↵ | Charles Krinke | 2009-12-23 | 4 | -2/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts. Signed-off-by: Charles Krinke <cfk@pacbell.net> | |||||
| | | * | | Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the ↵ | Diva Canto | 2009-12-22 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | stream can be closed. | |||||
| | * | | | Fix a bounds exception I came across in IAR restore | Melanie | 2009-12-23 | 1 | -0/+5 | |
| | |/ / | ||||||
* | | | | Fix for landing points. Only one scenario is not fully covered by this ↵ | CasperW | 2009-12-26 | 3 | -15/+59 | |
| | | | | | | | | | | | | | | | | change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point. | |||||
* | | | | Add a debugger tag to stop Visual Studio from breaking | CasperW | 2009-12-23 | 1 | -0/+1 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'master' of ssh://TOR/var/git/careminster | CasperW | 2009-12-23 | 32 | -233/+10765 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 2 | -0/+9 | |
| |\ \ | | |/ | ||||||
| | * | Remove GetState. It is really unused and was reinstated by the revert | Melanie | 2009-12-22 | 1 | -7/+0 | |
| | | | ||||||
| | * | Revert "Remove an insterface member that was never used" | Melanie | 2009-12-22 | 2 | -0/+16 | |
| | | | | | | | | | | | | | | | | | | | | | It was used. By the API, which is dynamically loaded. So it didn't complain until it hit Bamboo This reverts commit 33d5018e94e52cb875bf43bced623bdc6aa41ef0. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 2 | -17/+0 | |
| |\ \ | | |/ | ||||||
| | * | Remove an insterface member that was never used | Melanie | 2009-12-22 | 2 | -16/+0 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 5 | -75/+98 | |
| |\ \ | | |/ | ||||||
| | * | FINALLY! Script compile errors now appear in the script error pane, | Melanie | 2009-12-22 | 5 | -75/+98 | |
| | | | | | | | | | | | | not in a funky debug window. | |||||
| | * | Add a data path for error messages | root | 2009-12-22 | 5 | -6/+44 | |
| | | | | | | | | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2009-12-22 | 5 | -6/+44 | |
| |\ \ | ||||||
| | * | | Add a data path for error messages | root | 2009-12-22 | 5 | -6/+44 | |
| | | | | ||||||
| * | | | Fix conflicts | Kitto Flora | 2009-12-22 | 12 | -20/+69 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Should not commit without compiling | root | 2009-12-22 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Jumped the gun... | root | 2009-12-22 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Allow 100ms for scripts to run attach(NULL_KEY) on detach | root | 2009-12-22 | 1 | -0/+12 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 9 | -17/+31 | |
| | |\ \ | | | |/ | ||||||
| | | * | Glue code for a couple of new LSL function implementations | Melanie | 2009-12-22 | 13 | -5/+237 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 3 | -9/+34 | |
| | |\ \ | | | |/ | ||||||
| | | * | When a script has been loaded, remove it's state entry, so recompiling | Melanie | 2009-12-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | doesn't pick up the old state again. | |||||
| | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-21 | 1 | -2/+13 | |
| | | |\ | ||||||
| | | | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-12-21 | 1 | -8/+32 | |
| | | | |\ | ||||||
| | | | * | | Bug fix: in standalone, HGInventoryBroker needs to get the local inventory ↵ | Diva Canto | 2009-12-21 | 1 | -2/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | server URL from NetworkServersInfo. | |||||
| | | * | | | Fixes some incorrect values returned by llGetPrimitiveParams() and ↵ | Jeff Lee | 2009-12-21 | 1 | -7/+20 | |
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | osGetLinkPrimitiveParams(). Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | | Include ChOdePlugin | Kitto Flora | 2009-12-22 | 13 | -118/+10524 | |
| |/ / / | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 1 | -8/+32 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Patch from Ziah. | Melanie | 2009-12-21 | 1 | -8/+32 | |
| | |/ | | | | | | | | | | | | | Mantis #4456: Patch to implement some minor MRM Functions : SitTarget, SitTargetText, TouchText and Text | |||||
* | | | Added some null reference and deleted group checks to certain functions to ↵ | CasperW | 2009-12-23 | 1 | -29/+85 | |
|/ / | | | | | | | fix region crash scenarios. | |||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-21 | 9 | -57/+107 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 3 | -26/+78 | |
| |\ \ | | |/ | ||||||
| | * | Script State Fix: Part 2 | Melanie | 2009-12-21 | 3 | -24/+69 | |
| | | | | | | | | | | | | | | | | | | Change the reader to wrap old-style definitions in new style wrappers. Change importer to not check irrelevant data that can't be reconstructed This removes the last bit of knowledge of XEngine's .state files from core. | |||||
| | * | Remove extra checking on the itemID of saved state, since it changes during | Melanie | 2009-12-21 | 1 | -4/+5 | |
| | | | | | | | | | | | | rez from inventory. | |||||
| | * | Script State Fix: Step 1 | Melanie | 2009-12-21 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | Add Engine=xxx attribute and check for it's presence. Ignore state data written bby another engine | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-20 | 5 | -9/+20 | |
| |\ \ | | |/ | ||||||
| | * | Fix a case where an idle sim can eat 100% of a core | Melanie | 2009-12-20 | 1 | -1/+1 | |
| | | | ||||||
| | * | * Bug fix in HG: preserve the home region coordinates across multiple HG TPs. | Diva Canto | 2009-12-19 | 2 | -3/+14 | |
| | | | | | | | | | | | | * Removed unnecessary debug messages. | |||||
| | * | random drive-by minor math optimization. No need for concern, bitshed was ↵ | dahlia | 2009-12-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | within acceptable limits | |||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -3/+3 | |
| | | | ||||||
| * | | Merge branch 'casper' | CasperW | 2009-12-20 | 3 | -132/+6 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'tests' | Kitto Flora | 2009-12-19 | 1 | -22/+9 | |
| |\ \ \ | ||||||
| | * | | | Fix mantis #10 & #14 | Kitto Flora | 2009-12-19 | 1 | -23/+10 | |
| | | | | |