Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-21 | 6 | -77/+435 |
| |\ \ \ | | |/ / | |||||
| | * | | 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 | 6 | -77/+106 |
| | |/ | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-19 | 4 | -17/+18 |
| |\ \ | | |/ | |||||
| | * | 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 | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-19 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | 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 /var/git/opensim/ | opensim mirror account | 2010-11-19 | 2 | -85/+121 |
| |\ \ | | |/ | |||||
| | * | 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 | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-18 | 1 | -53/+74 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 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> | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-17 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | small refactor: reuse existing commandLine string rather than calling ↵ | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | cmdline.ToString() again | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-17 | 1 | -2/+7 |
| |\ \ | | |/ | |||||
| | * | save all lines to history, not just those which turn out to be valid ↵ | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | comands. does not store passwords also, blank lines are not stored to history this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-17 | 4 | -48/+130 |
| |\ \ | | |/ | |||||
| | * | Make "show queues [full]" behave like "show users [full]" | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -11/+22 |
| | | | | | | | | | | | | Now, "show queues" only shows root agents. "show queues full" will show child agents as well | ||||
| | * | add "Unacked bytes" column to "show queues" | Justin Clark-Casey (justincc) | 2010-11-17 | 2 | -8/+13 |
| | | | | | | | | | | | | This should show the number of bytes sent to the client that it has not yet acknowledged. | ||||
| | * | Fix "show queues" console command | Justin Clark-Casey (justincc) | 2010-11-17 | 2 | -35/+88 |
| | | | | | | | | | | | | | | | For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.) Sometimes useful for diagnostics | ||||
| | * | minor: add some method comments | Justin Clark-Casey (justincc) | 2010-11-17 | 2 | -2/+15 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-17 | 2 | -9/+16 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-17 | 5 | -12/+61 |
| | |\ | |||||
| | * | | Fix gesture and viewer preview sounds not playing | Melanie | 2010-11-17 | 2 | -9/+16 |
| | | | |