Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-23 | 11 | -82/+252 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-23 | 11 | -83/+253 |
| |\ | |||||
| | * | Initialize InventoryItemBase.creatorData properly. Could throw. | Diva Canto | 2010-11-23 | 1 | -1/+1 |
| | | | |||||
| | * | Fix: Allow use of parameters without specifying a file path with command ↵ | Marck | 2010-11-23 | 1 | -1/+1 |
| | | | | | | | | | | | | "save oar" | ||||
| | * | Fix joining land parcels not being stored correctly in SQLite. Thank you to ↵ | Marck | 2010-11-23 | 2 | -0/+6 |
| | | | | | | | | | | | | goetz for the initial patch in Mantis #5230. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-23 | 2 | -15/+4 |
| | |\ | |||||
| | | * | Let CHANGED_SCALE also trigger when editing prims and linksets with the ↵ | Marck | 2010-11-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | viewer's edit tools. This event used to trigger only when the scale was changed with a script. | ||||
| | | * | Let CHANGED_SHAPE trigger. This fixes Mantis #1844. | Marck | 2010-11-22 | 1 | -15/+2 |
| | | | | |||||
| | * | | Only perform the take object permissions check if an object is being ↵ | Justin Clark-Casey (justincc) | 2010-11-23 | 1 | -55/+50 |
| | | | | | | | | | | | | | | | | attached directly from the scene, not from existing inventory | ||||
| | * | | adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared | Justin Clark-Casey (justincc) | 2010-11-22 | 1 | -2/+7 |
| | | | | |||||
| | * | | add basic tests to check that under default permissions module owner can ↵ | Justin Clark-Casey (justincc) | 2010-11-22 | 4 | -11/+186 |
| | |/ | | | | | | | | | | delete objects and that non-owners (who are also not administrators, etc.) cannot | ||||
| * | | Fix more potential nullrefs | Melanie | 2010-11-23 | 1 | -2/+4 |
| | | | |||||
| * | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-23 | 2 | -1/+9 |
| |/ | |||||
| * | Fox case on a method | Melanie | 2010-11-22 | 1 | -3/+3 |
| | | |||||
* | | Fix more potential nullrefs | Melanie | 2010-11-23 | 1 | -2/+4 |
| | | |||||
* | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-22 | 5 | -2/+34 |
| | | |||||
* | | Make an invalud key string in llTextBox and llDialog non fatal to avoid | Melanie | 2010-11-22 | 1 | -2/+2 |
| | | | | | | | | breakinf sloppily made no-mod scripted items. | ||||
* | | Fox case on a method | Melanie | 2010-11-22 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 2 | -8/+34 |
|\ \ | |/ | |||||
| * | Change FS Voice module to a shared module to avoid gratuitious server handler | Melanie | 2010-11-22 | 1 | -6/+30 |
| | | | | | | | | | | registrations. Add the missing bits to drive the local connector's HTTP requests. This makes standalones work. | ||||
| * | Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART ↵ | Marck | 2010-11-22 | 1 | -2/+4 |
| | | | | | | | | | | | | and CHANGED_REGION work. Fixes Mantix #5214. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 31 | -87/+683 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-22 | 32 | -87/+684 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-21 | 9 | -692/+675 |
| | |\ | |||||
| | * | | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 24 | -53/+272 |
| | | | | | | | | | | | | | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255). | ||||
| | * | | Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still ↵ | Diva Canto | 2010-11-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | used?!? | ||||
| | * | | Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of ↵ | Diva Canto | 2010-11-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | SOP.CreatorID. Untested, but should work. | ||||
| | * | | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 14 | -56/+434 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule. | ||||
| * | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵ | Melanie | 2010-11-22 | 2 | -2/+4 |
| | |/ | |/| | | | | | | | why standalone should not. | ||||
* | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵ | Melanie | 2010-11-22 | 2 | -2/+4 |
| | | | | | | | | | | | | why standalone should not. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-21 | 11 | -716/+288 |
|\ \ \ | |/ / | |||||
| * | | Add the remote connector for freeswitch config retrieval | Melanie | 2010-11-21 | 1 | -0/+103 |
| | | | |||||
| * | | Finish the standalone mode freeswitch work and add config examples | Melanie | 2010-11-21 | 1 | -43/+47 |
| | | | |||||
| * | | Remove username and password from the publicly accessible FS config | Melanie | 2010-11-21 | 1 | -3/+1 |
| | | | |||||
| * | | Convert the Freeswitch module to new style | Melanie | 2010-11-21 | 1 | -93/+98 |
| | | | |||||
| * | | Strip the dialplan and directory methods from the region module | Melanie | 2010-11-21 | 3 | -522/+10 |
| | | | |||||
| * | | Implement a method to allow regions to query the gridwide Freeswitch | Melanie | 2010-11-21 | 3 | -0/+40 |
| | | | | | | | | | | | | configuration from ROBUST | ||||
| * | | Move Dialplan and Directory from the region module to the ROBUST server | Melanie | 2010-11-21 | 1 | -4/+333 |
| | | | |||||
| * | | Start implementing Freeswitch in ROBUST | Melanie | 2010-11-21 | 5 | -77/+93 |
| |/ | |||||
| * | Fix global region coordinates that are delivered by llRequestSimulatorData. | Marck | 2010-11-20 | 1 | -6/+6 |
| | | | | | | | | Also did some source code clean-up by replacing literals with constants. | ||||
| * | Knock V0_2 decals off archive tests since they're misleading | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -8/+8 |
| | | |||||
| * | Fix unit tests and save problems | Justin Clark-Casey (justincc) | 2010-11-20 | 3 | -3/+4 |
| | | | | | | | | | | | | (note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly). Firstly, if you can save a version 1.0 OAR then you can load it too. Secondly, closing the save stream even on success before assets/objects are saved is a bad idea | ||||
| * | correct build break. for some reason, xbuild didn't rebuild test dlls | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -53/+74 |
| |\ | |||||
| * | | Bump oar version to 1.0 from 0.5 | Justin Clark-Casey (justincc) | 2010-11-20 | 2 | -85/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved Also closes save stream properly in the event of an error Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line e.g. save oar --version=0 oars/test.oar | ||||
* | | | Add the remote connector for freeswitch config retrieval | Melanie | 2010-11-21 | 1 | -0/+103 |
| | | | |||||
* | | | Move Dialplan and Directory from the region module to the ROBUST server | Melanie | 2010-11-21 | 1 | -4/+333 |
| | | | |||||
* | | | Start implementing Freeswitch in ROBUST | Melanie | 2010-11-21 | 5 | -77/+93 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-18 | 6 | -104/+212 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fixed appearance send for avatars with only default textures. This should ↵ | Master ScienceSim | 2010-11-18 | 1 | -53/+74 |
| |/ | | | | | | | | | | | fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes. Signed-off-by: Melanie <melanie@t-data.com> |