Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-27 | 21 | -0/+29821 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-27 | 18 | -0/+29787 |
| |\ | |||||
| | * | * Implements some basic Sirikata protocol work (initial handshakes). | Adam Frisby | 2009-12-27 | 2 | -1/+57 |
| | | | |||||
| | * | * Added prebuild for previous commit. | Adam Frisby | 2009-12-27 | 1 | -0/+33 |
| | | | |||||
| | * | * Implements Sirikata ClientStack Module | Adam Frisby | 2009-12-27 | 17 | -0/+29698 |
| | | | | | | | | | | | | * Just a stub (imports all the sirikata protocol, and that's about it.) | ||||
| * | | Encode the published and mature checkboxes into the user flags for | Melanie | 2009-12-27 | 1 | -0/+3 |
| |/ | | | | | | | profiles | ||||
| * | * Adding Google.ProtocolBuffers.dll dependency (BSD licensed) | Adam Frisby | 2009-12-27 | 2 | -0/+31 |
| | | | | | | | | * For some experimental work with a Sirikata clientstack. | ||||
| * | Correct some issues with the last commit | root | 2009-12-26 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-27 | 1 | -3/+5 |
|\ \ | |||||
| * | | Correct some issues with the last commit | root | 2009-12-27 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | Close a SQL injection loophole in the new database driver | Melanie | 2009-12-26 | 1 | -2/+3 |
| | | | |||||
* | | | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ↵ | CasperW | 2009-12-27 | 1 | -11/+13 |
|/ / | | | | | | | ReaderWriteLockSlim, hopefully fixes a native crash | ||||
* | | Make sure that we're not bounds checking attachments. 'Cos otherwise your ↵ | CasperW | 2009-12-26 | 1 | -2/+2 |
| | | | | | | | | hair will end up on your bum. Seen that before? | ||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-26 | 30 | -20/+744 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 8 | -1/+43 |
| |\ \ | | |/ | |||||
| | * | Add AvatarInterestsReply | Melanie | 2009-12-26 | 8 | -1/+43 |
| | | | |||||
| | * | Make the GenericTableHandler work as intended | root | 2009-12-26 | 1 | -2/+8 |
| | | | |||||
| * | | Make the GenericTableHandler work as intended | root | 2009-12-26 | 1 | -2/+8 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 1 | -0/+25 |
| |\ \ | | |/ | |||||
| | * | Add a generic REPLACE INTO handler for put into the generic table handler | Melanie | 2009-12-26 | 1 | -0/+25 |
| | | | |||||
| * | | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS | Melanie | 2009-12-25 | 1 | -1/+1 |
| | | | | | | | | | | | | in the repo. This is the Caremninster repo and the number follows CORE. Always. | ||||
| * | | Restore version suffix. | Melanie | 2009-12-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2009-12-25 | 3 | -2/+28 |
| |\ \ | | | | | | | | | | | | | careminster | ||||
| | * | | Recover out-of-region objects during db load. | Kitto Flora | 2009-12-24 | 3 | -2/+28 |
| | | | | |||||
| * | | | 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' 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 |
| | |/ / | |||||
* | | | | 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 | 38 | -241/+10868 |
|\ \ \ | |/ / |