aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2317-99/+307
|\
| * Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-231-2/+4
| |\
| | * Attempt at fixing failing test.Diva Canto2010-11-231-2/+4
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-233-3/+13
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-2311-83/+253
| | |\
| | * | Fix more potential nullrefsMelanie2010-11-231-2/+4
| | * | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-232-1/+9
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-231-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Initialize InventoryItemBase.creatorData properly. Could throw.Diva Canto2010-11-231-1/+1
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-233-1/+7
| |\ \ \ | | |/ /
| | * | Fix: Allow use of parameters without specifying a file path with command "sav...Marck2010-11-231-1/+1
| | * | Fix joining land parcels not being stored correctly in SQLite. Thank you to g...Marck2010-11-232-0/+6
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-225-66/+241
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-11-232-15/+4
| | |\ \
| | * | | Only perform the take object permissions check if an object is being attached...Justin Clark-Casey (justincc)2010-11-231-55/+50
| | * | | adapt tests to use DeRezObjects() since DeRezObject() has recently disappearedJustin Clark-Casey (justincc)2010-11-221-2/+7
| | * | | add basic tests to check that under default permissions module owner can dele...Justin Clark-Casey (justincc)2010-11-224-11/+186
| | | |/ | | |/|
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-222-15/+4
| |\ \ \ | | | |/ | | |/|
| | * | Let CHANGED_SCALE also trigger when editing prims and linksets with the viewe...Marck2010-11-221-0/+2
| | * | Let CHANGED_SHAPE trigger. This fixes Mantis #1844.Marck2010-11-221-15/+2
| | |/
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-221-3/+3
| |\ \ | | |/
| | * Fox case on a methodMelanie2010-11-221-3/+3
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-221-6/+30
| |\ \ | | |/
| | * Change FS Voice module to a shared module to avoid gratuitious server handlerMelanie2010-11-221-6/+30
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-221-2/+4
| |\ \ | | |/
| | * Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART a...Marck2010-11-221-2/+4
* | | 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 why...Melanie2010-11-222-2/+4
| * | | 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
| | * | Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still u...Diva Canto2010-11-211-2/+2
| | * | Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of ...Diva Canto2010-11-211-2/+2
| | * | Global creator information working on MySQL DB and on load/save OARs. Creator...Diva Canto2010-11-2114-56/+434
| * | | 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
| * | | 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