aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-256-10/+11
|\ \ | |/
| * * Updated libomv to r3461Latif Khalifa2010-10-246-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-refactorMelanie2010-10-182-0/+6
|\ \ | |/
| * initial support for meshies physics. Must set ini option ↵dahlia2010-10-182-0/+6
| | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-161-0/+0
|\ \ | |/
| * UPdated the MySql driver to 6.2.4. Also established a much larger ↵Diva Canto2010-10-151-0/+0
| | | | | | | | MySqlCommand timeout on fetching prims.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-168-27887/+28009
|\ \ | |/
| * more work in progress on mesh physics - still non-functionaldahlia2010-10-141-22/+6
| |
| * libomv update to support headerless llsd binary deserialization needed for ↵Latif Khalifa2010-10-146-6/+63
| | | | | | | | | | | | mesh asset decoding Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * Updated to libomv-opensim r3449Latif Khalifa2010-10-147-15645/+15726
| |
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-131-9/+8
| |\ | | | | | | | | | | | | Conflicts: bin/OpenSimDefaults.ini
| * | * Normalizing endlines so git stops complaining about them being inconsistent.Teravus Ovares (Dan Olivares)2010-10-135-27893/+27893
| | | | | | | | | | | | * People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-131-9/+8
|\ \ \ | | |/ | |/|
| * | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. ChangeMelanie2010-10-131-9/+8
| |/ | | | | | | | | .ini.example ";;" format to normal ini format, since the defaults file is not parsed that way.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-101-0/+6
|\ \ | |/
| * Added missing sections to StandaloneHypergrid.iniDiva Canto2010-10-091-0/+6
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-092-2/+13
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-082-9/+9
| |\
| | * move CacheSculptMaps ini flag to OpenSimDefaults.inidahlia2010-10-072-9/+9
| | | | | | | | | | | | comment it and change defailt to true to reflect code
| * | Clarify the format comment at the top of OpenSim.ini.exampleMelanie2010-10-081-1/+4
| |/
| * add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵dahlia2010-10-071-0/+8
| | | | | | | | caching for meshing
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-067-52/+50
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-041-4/+3
| |
| * Formatting cleanup.Jeff Ames2010-10-046-48/+47
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-0411-27968/+27897
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-041-0/+3
| |\
| | * Made the home agent handler check for xff if behind a proxy.Diva Canto2010-10-031-0/+3
| | |
| * | Added Meshmerizer rendering plugin for libomvLatif Khalifa2010-10-041-0/+0
| | |
| * | Removed linden rendererLatif Khalifa2010-10-041-0/+0
| | |
| * | Use libomv 0.8.4.3445Latif Khalifa2010-10-047-27968/+27887
| |/
| * Made the Gatekeeper proxy-able.Diva Canto2010-10-032-0/+7
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-0/+0
|\ \ | |/
| * Add the matching PrimMesher.dllMelanie2010-10-041-0/+0
| |
| * Replaced OpenMetaverse dlls with ones compiled in Windows.Diva Canto2010-10-037-18612/+17739
| |
| * Add linden prim renderer and update libOMVMelanie2010-10-048-16751/+18045
| |
* | Update libOMVMelanie2010-10-047-18612/+17739
| |
* | Add linden prim renderer and update libOMVMelanie2010-10-048-16751/+18045
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-033-0/+0
|\ \ | |/
| * Upgraded Mono.Addins.dll to 0.5, coming from here: ↵Diva Canto2010-10-033-0/+0
| | | | | | | | http://monoaddins.codeplex.com/
| * Add the Warp3D dllMelanie2010-10-031-0/+0
| |
* | Add the Warp3D dllMelanie2010-10-031-0/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-1/+1
|\ \ | |/
| * adding -logconfig to Robust.exeBlueWall2010-10-011-1/+1
| | | | | | | | | | | | Adding -logconfig to Robust.exe. will still process the -logfile option, as before. No options given, the value "Robust.log" will be written in the ./bin directory
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-261-1/+1
|\ \ | |/
| * Another typo fixMelanie2010-09-261-1/+1
| |
| * adding configurable j2kDecodeCache pathBlueWall2010-09-261-6/+0
| | | | | | | | | | | | | | | | allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache
| * Some cleanup to OpenSimDefaults.iniBlueWall2010-09-261-0/+9
| | | | | | | | Fixing a couple of errors
| * Changes to preceding patch to make it conform to inifile formats. BLANK LINEMelanie2010-09-262-4/+4
| | | | | | | | | | before each comment/option group, and DOUBLE SEMICOLONS before pure text comments in OpenSim.ini.exemaple
| * Add configurable path to script engine assembliesBlueWall2010-09-262-1/+8
| | | | | | | | | | | | | | | | | | Adding ability to place script engine assemblies outside the codebase directories. Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies" Signed-off-by: Melanie <melanie@t-data.com>
* | Merge MasterMelanie2010-09-262-0/+10
| |