Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-25 | 2 | -0/+17 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-25 | 1 | -0/+4 |
| |\ | |||||
| | * | Clear Shape.SculptEntry if prim type is not a sculptie in ↵ | dahlia | 2009-12-24 | 1 | -0/+4 |
| | | | | | | | | | | | | llSetPrimitiveParams() - addresses Mantis #4462 | ||||
| * | | Enable the profile module to be replaced completely, even for the base | Melanie | 2009-12-25 | 1 | -0/+13 |
| |/ | | | | | | | profile data | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-24 | 7 | -1/+490 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-24 | 7 | -1/+490 |
| |\ | |||||
| | * | No-op in this commit. Just increasing the tag number due to weirdnesses. | Diva Canto | 2009-12-23 | 1 | -1/+1 |
| | | | |||||
| | * | Library Module: allows adding folders/items to the Library from IAR files ↵ | Diva Canto | 2009-12-23 | 7 | -1/+490 |
| | | | | | | | | | | | | placed under bin/Library. This works only for standalones. | ||||
| * | | Add the LSL List Size property | Melanie | 2009-12-24 | 1 | -1/+40 |
| |/ | |||||
* | | Add the body to the LSL List Size property | Melanie | 2009-12-24 | 1 | -2/+36 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-24 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Fixes the broken build of the previous commit. | Diva Canto | 2009-12-23 | 1 | -1/+2 |
| | | |||||
* | | 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' of ssh://TOR/var/git/careminster | CasperW | 2009-12-23 | 38 | -241/+10868 |
| |\ \ | |||||
| * | | | 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 careminster | Melanie | 2009-12-23 | 7 | -11/+55 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-23 | 7 | -11/+50 |
| |\ \ | |||||
| | * | | Change in how the Library returns its descendant folders, so that it ↵ | Diva Canto | 2009-12-23 | 1 | -1/+20 |
| | | | | | | | | | | | | | | | | includes folders added after the initial load off the file system, by other mechanisms. | ||||
| | * | | 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> | ||||
| | * | | - commented out unused method ConvertIHttpClientContextToOSHttp | dr scofield (aka dirk husemann) | 2009-12-23 | 1 | -7/+7 |
| | | | | |||||
| | * | | 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 |
| |/ / | |||||
* | | | 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 missing file | Melanie | 2009-12-22 | 1 | -0/+54 |
| | | | |||||
| * | | Add a data path for error messages | root | 2009-12-22 | 6 | -14/+57 |
| | | | | | | | | | | | | | | | | | | 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 | Melanie | 2009-12-22 | 14 | -111/+10545 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2009-12-22 | 6 | -14/+57 |
| |\ \ \ | |||||
| * \ \ \ | Fix conflicts | Kitto Flora | 2009-12-22 | 14 | -20/+74 |
| |\ \ \ \ | |||||
| * | | | | | Include ChOdePlugin | Kitto Flora | 2009-12-22 | 14 | -118/+10554 |
| | | | | | | |||||
* | | | | | | Add missing file | Melanie | 2009-12-22 | 1 | -0/+54 |
| |_|/ / / |/| | | | | |||||
* | | | | | Add a data path for error messages | root | 2009-12-22 | 6 | -14/+57 |
| |/ / / |/| | | | |||||
* | | | | 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 | 5 | -9/+39 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-21 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-12-21 | 1 | -7/+20 |
| | |\ \ | |||||
| | * | | | Bug fix: set the map image upon hyperlinking regions. | Diva Canto | 2009-12-21 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | 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 | 2 | -2/+15 |
| |\ \ \ | | |/ / |