Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 17 | -99/+307 |
|\ | |||||
| * | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-23 | 1 | -2/+4 |
| |\ | |||||
| | * | Attempt at fixing failing test. | Diva Canto | 2010-11-23 | 1 | -2/+4 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-23 | 3 | -3/+13 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-23 | 11 | -83/+253 |
| | |\ | |||||
| | * | | 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 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-23 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Initialize InventoryItemBase.creatorData properly. Could throw. | Diva Canto | 2010-11-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-23 | 3 | -1/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | 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 /var/git/opensim/ | opensim mirror account | 2010-11-22 | 5 | -66/+241 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-23 | 2 | -15/+4 |
| | |\ \ | |||||
| | * | | | 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 | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-22 | 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 |
| | |/ | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-22 | 1 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | Fox case on a method | Melanie | 2010-11-22 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-22 | 1 | -6/+30 |
| |\ \ | | |/ | |||||
| | * | 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. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-22 | 1 | -2/+4 |
| |\ \ | | |/ | |||||
| | * | 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-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 68 | -1114/+2012 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 2 | -2/+4 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-22 | 32 | -87/+684 |
| | |\ | |||||
| | * | | 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' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 32 | -87/+684 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-21 | 12 | -729/+715 |
| | |\ \ | | | |/ | |||||
| | * | | 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. | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 1 | -0/+103 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Add the remote connector for freeswitch config retrieval | Melanie | 2010-11-21 | 1 | -0/+103 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 3 | -82/+75 |
| |\ \ \ | | |/ / | |||||
| | * | | Finish the standalone mode freeswitch work and add config examples | Melanie | 2010-11-21 | 3 | -82/+75 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 1 | -3/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Remove username and password from the publicly accessible FS config | Melanie | 2010-11-21 | 1 | -3/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 1 | -93/+98 |
| |\ \ \ | | |/ / | |||||
| | * | | Convert the Freeswitch module to new style | Melanie | 2010-11-21 | 1 | -93/+98 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 3 | -522/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Strip the dialplan and directory methods from the region module | Melanie | 2010-11-21 | 3 | -522/+10 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 4 | -0/+41 |
| |\ \ \ | | |/ / | |||||
| | * | | Implement a method to allow regions to query the gridwide Freeswitch | Melanie | 2010-11-21 | 4 | -0/+41 |
| | | | | | | | | | | | | | | | | configuration from ROBUST | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Correct an error in Robust.ini.example | Melanie | 2010-11-21 | 1 | -1/+1 |
| | | | |