aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2009-12-231-1/+41
|\
| * Add saving assets from gestures to IARMelanie2009-12-231-1/+41
| |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2009-12-231-29/+85
|\ \ | | | | | | | | | careminster
| * \ Merge branch 'master' of ssh://TOR/var/git/careminsterCasperW2009-12-2338-241/+10868
| |\ \
| * | | Added some null reference and deleted group checks to certain functions to ↵CasperW2009-12-231-29/+85
| | | | | | | | | | | | | | | | fix region crash scenarios.
* | | | Merge branch 'master' into careminsterMelanie2009-12-237-11/+55
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-237-11/+50
| |\ \
| | * | Change in how the Library returns its descendant folders, so that it ↵Diva Canto2009-12-231-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 Krinke2009-12-234-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 ConvertIHttpClientContextToOSHttpdr scofield (aka dirk husemann)2009-12-231-7/+7
| | | |
| | * | Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the ↵Diva Canto2009-12-221-1/+7
| | | | | | | | | | | | | | | | stream can be closed.
| * | | Fix a bounds exception I came across in IAR restoreMelanie2009-12-231-0/+5
| |/ /
* | | Merge branch 'master' into careminsterMelanie2009-12-222-0/+9
|\ \ \ | |/ /
| * | Remove GetState. It is really unused and was reinstated by the revertMelanie2009-12-221-7/+0
| | |
| * | Revert "Remove an insterface member that was never used"Melanie2009-12-222-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 careminsterMelanie2009-12-222-17/+0
|\ \ \ | |/ /
| * | Remove an insterface member that was never usedMelanie2009-12-222-16/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2009-12-225-75/+98
|\ \ \ | |/ /
| * | FINALLY! Script compile errors now appear in the script error pane,Melanie2009-12-225-75/+98
| | | | | | | | | | | | not in a funky debug window.
| * | Add missing fileMelanie2009-12-221-0/+54
| | |
| * | Add a data path for error messagesroot2009-12-226-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/careminsterMelanie2009-12-2214-111/+10545
|\ \ \
| * \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2009-12-226-14/+57
| |\ \ \
| * \ \ \ Fix conflictsKitto Flora2009-12-2214-20/+74
| |\ \ \ \
| * | | | | Include ChOdePluginKitto Flora2009-12-2214-118/+10554
| | | | | |
* | | | | | Add missing fileMelanie2009-12-221-0/+54
| |_|/ / / |/| | | |
* | | | | Add a data path for error messagesroot2009-12-226-14/+57
| |/ / / |/| | |
* | | | Should not commit without compilingroot2009-12-221-1/+1
| | | |
* | | | Jumped the gun...root2009-12-221-1/+1
| | | |
* | | | Allow 100ms for scripts to run attach(NULL_KEY) on detachroot2009-12-221-0/+12
| | | |
* | | | Merge branch 'master' into careminsterMelanie2009-12-229-17/+31
|\ \ \ \ | | |/ / | |/| |
| * | | Glue code for a couple of new LSL function implementationsMelanie2009-12-2213-5/+237
| | | |
* | | | Merge branch 'master' into careminsterMelanie2009-12-215-9/+39
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-211-0/+3
| |\ \
| | * \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-12-211-7/+20
| | |\ \
| | * | | Bug fix: set the map image upon hyperlinking regions.Diva Canto2009-12-211-0/+3
| | | | |
| * | | | When a script has been loaded, remove it's state entry, so recompilingMelanie2009-12-211-0/+1
| | |/ / | |/| | | | | | | | | | doesn't pick up the old state again.
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-212-2/+15
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-12-211-8/+32
| | |\ \
| | * | | Bug fix: in standalone, HGInventoryBroker needs to get the local inventory ↵Diva Canto2009-12-212-2/+15
| | | | | | | | | | | | | | | | | | | | server URL from NetworkServersInfo.
| * | | | Fixes some incorrect values returned by llGetPrimitiveParams() and ↵Jeff Lee2009-12-211-7/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | osGetLinkPrimitiveParams(). Signed-off-by: Melanie <melanie@t-data.com>
* | | | Merge branch 'master' into careminsterMelanie2009-12-212-8/+33
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-211-0/+1
| |\ \ | | |/
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-12-214-27/+79
| | |\
| | * | Making the library read the item's flag, so that clothing items can have the ↵Diva Canto2009-12-211-0/+1
| | | | | | | | | | | | | | | | proper icons.
| * | | Patch from Ziah.Melanie2009-12-211-8/+32
| | |/ | |/| | | | | | | | | | Mantis #4456: Patch to implement some minor MRM Functions : SitTarget, SitTargetText, TouchText and Text
* | | Merge branch 'master' into casperCasperW2009-12-2115-288/+190
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2009-12-213-26/+78
| |\ \ \ | | |/ /
| | * | Script State Fix: Part 2Melanie2009-12-213-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 duringMelanie2009-12-211-4/+5
| | | | | | | | | | | | | | | | rez from inventory.
generated by cgit v1.1 at 2024-12-22 16:40:33 +0000