aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2168-1114/+2012
|\
| * Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-212-2/+4
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-2232-87/+684
| | |\
| | * | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵Melanie2010-11-222-2/+4
| | | | | | | | | | | | | | | | why standalone should not.
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-2132-87/+684
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-2112-729/+715
| | |\ \ | | | |/
| | * | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-2124-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 Canto2010-11-211-2/+2
| | | | | | | | | | | | | | | | used?!?
| | * | Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of ↵Diva Canto2010-11-211-2/+2
| | | | | | | | | | | | | | | | SOP.CreatorID. Untested, but should work.
| | * | Global creator information working on MySQL DB and on load/save OARs. ↵Diva Canto2010-11-2114-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 account2010-11-211-0/+103
| |\ \ \ | | | |/ | | |/|
| | * | Add the remote connector for freeswitch config retrievalMelanie2010-11-211-0/+103
| | | |
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-213-82/+75
| |\ \ \ | | |/ /
| | * | Finish the standalone mode freeswitch work and add config examplesMelanie2010-11-213-82/+75
| | | |
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-211-3/+1
| |\ \ \ | | |/ /
| | * | Remove username and password from the publicly accessible FS configMelanie2010-11-211-3/+1
| | | |
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-211-93/+98
| |\ \ \ | | |/ /
| | * | Convert the Freeswitch module to new styleMelanie2010-11-211-93/+98
| | | |
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-213-522/+10
| |\ \ \ | | |/ /
| | * | Strip the dialplan and directory methods from the region moduleMelanie2010-11-213-522/+10
| | | |
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-214-0/+41
| |\ \ \ | | |/ /
| | * | Implement a method to allow regions to query the gridwide FreeswitchMelanie2010-11-214-0/+41
| | | | | | | | | | | | | | | | configuration from ROBUST
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-211-1/+1
| |\ \ \ | | |/ /
| | * | Correct an error in Robust.ini.exampleMelanie2010-11-211-1/+1
| | | |
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-216-77/+435
| |\ \ \ | | |/ /
| | * | Move Dialplan and Directory from the region module to the ROBUST serverMelanie2010-11-211-4/+333
| | | |
| | * | Start implementing Freeswitch in ROBUSTMelanie2010-11-216-77/+106
| | |/
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-194-17/+18
| |\ \ | | |/
| | * Fix global region coordinates that are delivered by llRequestSimulatorData.Marck2010-11-201-6/+6
| | | | | | | | | | | | Also did some source code clean-up by replacing literals with constants.
| | * Knock V0_2 decals off archive tests since they're misleadingJustin Clark-Casey (justincc)2010-11-201-8/+8
| | |
| | * Fix unit tests and save problemsJustin Clark-Casey (justincc)2010-11-203-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 account2010-11-191-2/+2
| |\ \ | | |/
| | * correct build break. for some reason, xbuild didn't rebuild test dllsJustin Clark-Casey (justincc)2010-11-201-2/+2
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-192-85/+121
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-11-201-53/+74
| | |\
| | * | Bump oar version to 1.0 from 0.5Justin Clark-Casey (justincc)2010-11-202-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 account2010-11-181-53/+74
| |\ \ \ | | | |/ | | |/|
| | * | Fixed appearance send for avatars with only default textures. This should ↵Master ScienceSim2010-11-181-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 account2010-11-171-1/+1
| |\ \ | | |/
| | * small refactor: reuse existing commandLine string rather than calling ↵Justin Clark-Casey (justincc)2010-11-171-1/+1
| | | | | | | | | | | | cmdline.ToString() again
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-171-2/+7
| |\ \ | | |/
| | * save all lines to history, not just those which turn out to be valid ↵Justin Clark-Casey (justincc)2010-11-171-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 account2010-11-174-48/+130
| |\ \ | | |/
| | * Make "show queues [full]" behave like "show users [full]"Justin Clark-Casey (justincc)2010-11-171-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-172-8/+13
| | | | | | | | | | | | This should show the number of bytes sent to the client that it has not yet acknowledged.
| | * Fix "show queues" console commandJustin Clark-Casey (justincc)2010-11-172-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 commentsJustin Clark-Casey (justincc)2010-11-172-2/+15
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-172-9/+16
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-175-12/+61
| | |\
| | * | Fix gesture and viewer preview sounds not playingMelanie2010-11-172-9/+16
| | | |