Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ↵ | Melanie | 2009-09-30 | 12 | -751/+1468 |
|\ | | | | | | | into vehicles | ||||
| * | Merge branch '0.6.7-post-fixes' into vehicles | Kitto Flora | 2009-09-30 | 86 | -658/+4314 |
| |\ | |||||
| * | | And another merge issue | Kitto Flora | 2009-09-30 | 1 | -0/+1 |
| | | | |||||
| * | | And another | Kitto Flora | 2009-09-30 | 1 | -1/+1 |
| | | | |||||
| * | | Another small change to avoid later merge conflict | Kitto Flora | 2009-09-30 | 1 | -2/+3 |
| | | | |||||
| * | | Small chaneg to adapt to trunk | Kitto Flora | 2009-09-30 | 1 | -2/+3 |
| | | | |||||
| * | | Commit initial version of KittoFlora's vehicle changes | opensim | 2009-09-30 | 12 | -757/+1471 |
| | | | |||||
* | | | change 0.6.7 candidate branch down to RC1 | Justin Clark-Casey (justincc) | 2009-09-29 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Fix loading modules with alternate configurations and ports into ROBUST. | Melanie | 2009-09-29 | 14 | -55/+75 |
| | | | | | | | | Make all current modules support the configuration name option | ||||
* | | Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer. | Diva Canto | 2009-09-29 | 1 | -4/+8 |
| | | |||||
* | | Merge branch 'master' into 0.6.7-post-fixes | Melanie | 2009-09-28 | 2 | -6/+64 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs | ||||
| * | | Allow the notation config_name@port/dll_name:class_name as a handler spec | Melanie | 2009-09-28 | 2 | -6/+64 |
| | | | | | | | | | | | | | | | | | | in OpenSim.Server.ini This allows things like "8003/AssetServirce.dll local@8004/InventoryService.dll" The config name is not yet supported by any modules | ||||
| * | | Bump main version to 0.6.8-Dev | Melanie | 2009-09-28 | 1 | -1/+1 |
| | | | |||||
* | | | Bump version number in post-fixes | Melanie | 2009-09-28 | 1 | -2/+2 |
|/ / | |||||
* | | Change DocToBytes to return no trailing whitespace. | Melanie | 2009-09-28 | 1 | -1/+1 |
| | | |||||
* | | Make the RegionData plugin store the RegionName | Melanie | 2009-09-27 | 1 | -2/+3 |
| | | |||||
* | | Prevent manually setting Data["locX"] and Data["locY"], since that would | Melanie | 2009-09-27 | 1 | -0/+4 |
| | | | | | | | | overwrite the posX and posY members of the structure | ||||
* | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-09-27 | 60 | -803/+3363 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLRegionData.cs | ||||
| * \ | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -1/+40 |
| |\ \ | |||||
| | * | | corrections to viewerMode AddPos() | dahlia | 2009-09-25 | 2 | -1/+40 |
| | | | | |||||
| * | | | * Does a full battery of tests to ensure that the object isn't an attachment ↵ | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -4/+9 |
| |/ / | | | | | | | | | | | | | | | | | | | before border crossing * Fixes 'Inconsistent Attachment State' when teleporting into another region besides the SW most region slot on a MegaRegion. * Fixes a host of other unintended attachment border cross edge cases that lead to Inconsistent attachment state. | ||||
| * | | * Fixes teleporting within megaregions on HG enabled regions. You can ↵ | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -3/+9 |
| | | | | | | | | | | | | teleport around now. (but it still doesn't fix the inconsistent attachment state when teleporting into region slots that are not the south west region on megaregions) | ||||
| * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-09-25 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-09-25 | 22 | -444/+847 |
| |\ \ | |||||
| | * | | More small changes to FlotsamAssetCache as per mcortez' request. | Diva Canto | 2009-09-25 | 1 | -2/+2 |
| | | | | |||||
| | * | | Moved the property RegionLoginsEnabled from GridComms to the Scene -- not ↵ | Diva Canto | 2009-09-25 | 6 | -8/+15 |
| | | | | | | | | | | | | | | | | the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff. | ||||
| | * | | Better error handling on the client-side grid connector. | Diva Canto | 2009-09-25 | 1 | -44/+108 |
| | | | | |||||
| | * | | Added GridForm.html in Tests/Clients/Grid that shows how to interact with a ↵ | Diva Canto | 2009-09-25 | 2 | -7/+21 |
| | | | | | | | | | | | | | | | | grid server via regular Web forms. May be good for developing administrative tools. | ||||
| | * | | Better guards on RegisterRegion in GridService. | Diva Canto | 2009-09-25 | 3 | -8/+21 |
| | | | | | | | | | | | | | | | | Added serverPort to the fields that get stored (I think this is the UDP port). | ||||
| | * | | Make the grid client deregister the test regions at the end, so that they ↵ | Diva Canto | 2009-09-24 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | don't stay in the DB. | ||||
| | * | | Deleted the meaningless console commands on the GridService. Will need to ↵ | Diva Canto | 2009-09-24 | 1 | -72/+0 |
| | | | | | | | | | | | | | | | | add meaningful ones. | ||||
| | * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-24 | 4 | -190/+217 |
| | |\ \ | |||||
| | | * | | Meshmerizer stores dictionary of unique Meshes keyed on construction ↵ | Dan Lake | 2009-09-24 | 3 | -78/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE Signed-off-by: dahlia <dahliaTrimble@gmailDotCom> | ||||
| | | * | | modify BulletDotNETPrim.cs in preparation for Mantis #4181 | dahlia | 2009-09-24 | 1 | -112/+122 |
| | | | | | |||||
| | * | | | All tests pass for MySQL/MySQLRegionData. | Diva Canto | 2009-09-24 | 3 | -57/+24 |
| | |/ / | | | | | | | | | | | | | Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient. | ||||
| | * | | GridServerPostHandler finished. GridClient tests all work. More guards on ↵ | Diva Canto | 2009-09-24 | 5 | -84/+327 |
| | | | | | | | | | | | | | | | | getting parameters and replies over the wire. | ||||
| | * | | Added test GridClient, which allowed me to remove a few bugs out of the new ↵ | Diva Canto | 2009-09-24 | 7 | -12/+132 |
| | | | | | | | | | | | | | | | | code. | ||||
| * | | | Don't preserve full user profile details within iars for now | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | This information was not being used in the load process | ||||
| * | | | add control files containing version info to iars | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -0/+28 |
| | | | | |||||
| * | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-09-25 | 6 | -23/+21 |
| |/ / | |||||
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-09-24 | 21 | -345/+2276 |
| |\ \ | |||||
| | * | | Changed name of the hyperlink XMLRPC method to linkk-region, so that it ↵ | Diva Canto | 2009-09-24 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | doesn't conflict with the existing one. | ||||
| | * | | * Send Updated Information Packet to Clients after updating estate settings. | Adam Frisby | 2009-09-24 | 1 | -0/+2 |
| | | | | |||||
| | * | | * Establishing why new console commands fail to work. >_> | Adam Frisby | 2009-09-24 | 1 | -4/+6 |
| | | | | |||||
| | * | | * Fixing typo. | Adam Frisby | 2009-09-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | * Minor commit, added two new math utility functions. | Adam Frisby | 2009-09-24 | 1 | -0/+33 |
| | | | | |||||
| | * | | * Added two new commands to EstateManagementModule | Adam Frisby | 2009-09-24 | 1 | -6/+55 |
| | | | | | | | | | | | | | | | | * Also, I hate git. | ||||
| | * | | More tests. Seems to be working. | Diva Canto | 2009-09-23 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | Grid connector modules are enabled for standalones only, but nothing in the simulator uses them yet, so it's safe to go in. | ||||
| | * | | First test passes -- regions being registered and retrieved correctly in ↵ | Diva Canto | 2009-09-23 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | Data.Null. | ||||
| | * | | Unit tests for the grid service. Yey! | Diva Canto | 2009-09-23 | 1 | -0/+122 |
| | | | |