aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge git://opensimulator.org/git/opensimSean McNamara2011-04-2612-3846/+47
|\
| * Removed stale client components: MXP and VWoHTTP.Diva Canto2011-04-256-3826/+0
| * recover from unhandled exception from bad rotation data while processing enti...dahlia2011-04-251-1/+9
| * Made things consistent between LocalInventoryServiceConnector and RemoteXInve...Diva Canto2011-04-252-11/+32
| * Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.Diva Canto2011-04-251-6/+4
| * Upped VERSION_NUMBER in master to 0.7.2.Diva Canto2011-04-241-1/+1
| * Commented verbose debug message.Diva Canto2011-04-241-1/+1
* | Wait for OnOarFileSaved event callback before executing scriptSean McNamara2011-04-262-8/+29
* | Merge git://opensimulator.org/git/opensimSean McNamara2011-04-23104-2164/+3074
|\ \ | |/
| * Added MaxAgents configuration option to RegionConfig.ini allowing region host...E. Allen Soard2011-04-232-1/+21
| * print invalid command message to the console, not the logJustin Clark-Casey (justincc)2011-04-231-3/+1
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-04-212-0/+25
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-04-216-43/+81
| | |\
| | * | Implement agent limitsMelanie2011-04-212-0/+25
| * | | fix merge conflicts with OpenSimDefaults.iniBlueWall2011-04-218-80/+182
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-218-80/+182
| | |\ \
| | | * | Adjust freeswitch logging to be somewhat less noisy. However, there is still...Justin Clark-Casey (justincc)2011-04-212-14/+21
| | | * | minor: small amount of method doc and some commented out odds and endsJustin Clark-Casey (justincc)2011-04-211-6/+15
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-211-3/+10
| | | |\ \ | | | | |/
| | | | * fix meshing failure on sculpt maps smaller than 64x64dahlia2011-04-191-3/+10
| | | * | Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-212-22/+43
| | | |/
| | | * Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)2011-04-202-14/+67
| | | * Clean up freeswitch config to what is currently required. Add explanation to...Justin Clark-Casey (justincc)2011-04-193-27/+32
| * | | some mesh config astheticsBlueWall2011-04-212-2/+2
| |/ /
| * | Group collada meshies settings under [Mesh] in OpensimDefaults.iniBlueWall2011-04-211-1/+2
| |/
| * Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future co...Justin Clark-Casey (justincc)2011-04-183-8/+12
| * bump default IAR version to 0.2 and 1.1 for the --profile version.Justin Clark-Casey (justincc)2011-04-181-2/+2
| * bump oar version number to 0.6.Justin Clark-Casey (justincc)2011-04-181-1/+1
| * Add regression test to check that OARs start with the control file.Justin Clark-Casey (justincc)2011-04-183-9/+21
| * add test to ensure that an IAR starts with the control fileJustin Clark-Casey (justincc)2011-04-182-11/+39
| * refactor: split out the code which actually copies a particular bundle to inv...Justin Clark-Casey (justincc)2011-04-181-106/+115
| * refactor: rename DeleteToInventory() to CopyToInventory()Justin Clark-Casey (justincc)2011-04-183-3/+20
| * Fix bug where objects were being coalesced in the wrong positions.Justin Clark-Casey (justincc)2011-04-181-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-1814-425/+537
| |\
| | * Merge branch 'master' into test-merge0418Mic Bowman2011-04-1822-801/+626
| | |\
| | * | Remove the call to remove tokens from the parent. Under heavy loadMic Bowman2011-04-152-5/+14
| | * | Merge branch 'master' into queuetestMic Bowman2011-04-141-1/+5
| | |\ \
| | * \ \ Merge branch 'testmerge' into queuetestMic Bowman2011-04-1349-540/+1074
| | |\ \ \
| | | * | | remove packet monitoring debugging codeMic Bowman2011-04-131-116/+2
| | | * | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-133-7/+21
| | | * | | fixed a couple bugs with the property queuesMic Bowman2011-04-131-1/+37
| | | * | | First pass at moving object property requests into a queue similarMic Bowman2011-04-1311-208/+262
| | | * | | New tokenbucket algorithm. This one provides fair sharing of the queuesMic Bowman2011-04-134-145/+259
| | * | | | Merge branch 'master' of /home/git/repo/OpenSim into queuetestBlueWall2011-04-135-32/+85
| | |\ \ \ \
| | * | | | | remove packet monitoring debugging codeMic Bowman2011-04-121-116/+2
| | * | | | | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-123-7/+21
| | * | | | | fixed a couple bugs with the property queuesMic Bowman2011-04-121-1/+37
| | * | | | | Merge branch 'test-select' into queuetestMic Bowman2011-04-1211-208/+262
| | |\ \ \ \ \
| | | * | | | | First pass at moving object property requests into a queue similarMic Bowman2011-04-1211-208/+262
| | * | | | | | Merge branch 'master' into queuetestMic Bowman2011-04-126-26/+68
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |