Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 1 | -0/+14 | |
| |\ | ||||||
| | * | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 1 | -0/+14 | |
| | | | ||||||
| * | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 2 | -0/+34 | |
| | | | ||||||
| * | | Revert "Preliminary work on appearance layers. No user functionality yet." | Melanie | 2010-10-29 | 2 | -34/+0 | |
| | | | | | | | | | | | | | | | | | | This work conflicts with cmickeyb's more extensive, related work This reverts commit 9c829c0410da89fdbb873f706d7ba63cf26b088f. | |||||
| * | | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 2 | -0/+34 | |
| |/ | ||||||
* | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 2 | -0/+34 | |
| | | ||||||
* | | Revert "Preliminary work on appearance layers. No user functionality yet." | Melanie | 2010-10-29 | 2 | -34/+0 | |
| | | | | | | | | This reverts commit e6a8d2872c3ff4992cd7e9615f69e0c6773e461f. | |||||
* | | Add a default alpha layer | Melanie | 2010-10-29 | 1 | -0/+0 | |
| | | ||||||
* | | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 2 | -0/+34 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-25 | 6 | -10/+11 | |
|\ \ | |/ | ||||||
| * | * Updated libomv to r3461 | Latif Khalifa | 2010-10-24 | 6 | -10/+11 | |
| | | | | | | | | Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 2 | -0/+6 | |
|\ \ | |/ | ||||||
| * | initial support for meshies physics. Must set ini option ↵ | dahlia | 2010-10-18 | 2 | -0/+6 | |
| | | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 1 | -0/+0 | |
|\ \ | |/ | ||||||
| * | UPdated the MySql driver to 6.2.4. Also established a much larger ↵ | Diva Canto | 2010-10-15 | 1 | -0/+0 | |
| | | | | | | | | MySqlCommand timeout on fetching prims. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 8 | -27887/+28009 | |
|\ \ | |/ | ||||||
| * | more work in progress on mesh physics - still non-functional | dahlia | 2010-10-14 | 1 | -22/+6 | |
| | | ||||||
| * | libomv update to support headerless llsd binary deserialization needed for ↵ | Latif Khalifa | 2010-10-14 | 6 | -6/+63 | |
| | | | | | | | | | | | | mesh asset decoding Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
| * | Updated to libomv-opensim r3449 | Latif Khalifa | 2010-10-14 | 7 | -15645/+15726 | |
| | | ||||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-13 | 1 | -9/+8 | |
| |\ | | | | | | | | | | | | | Conflicts: bin/OpenSimDefaults.ini | |||||
| * | | * Normalizing endlines so git stops complaining about them being inconsistent. | Teravus Ovares (Dan Olivares) | 2010-10-13 | 5 | -27893/+27893 | |
| | | | | | | | | | | | | * People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy. | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-13 | 1 | -9/+8 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change | Melanie | 2010-10-13 | 1 | -9/+8 | |
| |/ | | | | | | | | | .ini.example ";;" format to normal ini format, since the defaults file is not parsed that way. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-10 | 1 | -0/+6 | |
|\ \ | |/ | ||||||
| * | Added missing sections to StandaloneHypergrid.ini | Diva Canto | 2010-10-09 | 1 | -0/+6 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 2 | -2/+13 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-08 | 2 | -9/+9 | |
| |\ | ||||||
| | * | move CacheSculptMaps ini flag to OpenSimDefaults.ini | dahlia | 2010-10-07 | 2 | -9/+9 | |
| | | | | | | | | | | | | comment it and change defailt to true to reflect code | |||||
| * | | Clarify the format comment at the top of OpenSim.ini.example | Melanie | 2010-10-08 | 1 | -1/+4 | |
| |/ | ||||||
| * | add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵ | dahlia | 2010-10-07 | 1 | -0/+8 | |
| | | | | | | | | caching for meshing | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 7 | -52/+50 | |
|\ \ | |/ | ||||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -4/+3 | |
| | | ||||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 6 | -48/+47 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 11 | -27968/+27897 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-04 | 1 | -0/+3 | |
| |\ | ||||||
| | * | Made the home agent handler check for xff if behind a proxy. | Diva Canto | 2010-10-03 | 1 | -0/+3 | |
| | | | ||||||
| * | | Added Meshmerizer rendering plugin for libomv | Latif Khalifa | 2010-10-04 | 1 | -0/+0 | |
| | | | ||||||
| * | | Removed linden renderer | Latif Khalifa | 2010-10-04 | 1 | -0/+0 | |
| | | | ||||||
| * | | Use libomv 0.8.4.3445 | Latif Khalifa | 2010-10-04 | 7 | -27968/+27887 | |
| |/ | ||||||
| * | Made the Gatekeeper proxy-able. | Diva Canto | 2010-10-03 | 2 | -0/+7 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -0/+0 | |
|\ \ | |/ | ||||||
| * | Add the matching PrimMesher.dll | Melanie | 2010-10-04 | 1 | -0/+0 | |
| | | ||||||
| * | Replaced OpenMetaverse dlls with ones compiled in Windows. | Diva Canto | 2010-10-03 | 7 | -18612/+17739 | |
| | | ||||||
| * | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 8 | -16751/+18045 | |
| | | ||||||
* | | Update libOMV | Melanie | 2010-10-04 | 7 | -18612/+17739 | |
| | | ||||||
* | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 8 | -16751/+18045 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 3 | -0/+0 | |
|\ \ | |/ | ||||||
| * | Upgraded Mono.Addins.dll to 0.5, coming from here: ↵ | Diva Canto | 2010-10-03 | 3 | -0/+0 | |
| | | | | | | | | http://monoaddins.codeplex.com/ | |||||
| * | Add the Warp3D dll | Melanie | 2010-10-03 | 1 | -0/+0 | |
| | | ||||||
* | | Add the Warp3D dll | Melanie | 2010-10-03 | 1 | -0/+0 | |
| | |