Commit Graph

1090 Commits (ade71c9ed7ce45b4acb1456df457fe94ad46bd23)

Author SHA1 Message Date
Melanie 4f39329d6f Rename the new default texture to be consistent with the others 2010-10-29 21:10:19 +01:00
Melanie 32e5bee3a7 Add a default alpha layer 2010-10-29 21:09:31 +01:00
Melanie 934e536738 Merge commit 'cmickeyb/dev-appearance' 2010-10-29 21:06:46 +01:00
Melanie 5f4badf9e2 Add my work on top of cmickeyb's 2010-10-29 20:44:29 +01:00
Melanie e6fe83cd93 Revert "Preliminary work on appearance layers. No user functionality yet."
This work conflicts with cmickeyb's more extensive, related work

This reverts commit 9c829c0410.
2010-10-29 20:17:59 +01:00
Melanie 9c829c0410 Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:58:22 +01:00
Master ScienceSim 68666efd25 Configuration of persistent baked textures and save/send delays. 2010-10-28 12:00:04 -07:00
Latif Khalifa c74c1620a1 * Updated libomv to r3461
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.
2010-10-24 23:51:46 +01:00
dahlia 7fa3335fd5 initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. 2010-10-18 04:17:36 -07:00
Diva Canto e039a8c8c2 UPdated the MySql driver to 6.2.4. Also established a much larger MySqlCommand timeout on fetching prims. 2010-10-15 15:43:06 -07:00
dahlia bcdd03c1cf more work in progress on mesh physics - still non-functional 2010-10-14 20:25:31 -07:00
Latif Khalifa b4c54765d2 libomv update to support headerless llsd binary deserialization needed for mesh asset decoding
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-14 21:26:26 -04:00
Latif Khalifa 69dbfe2a69 Updated to libomv-opensim r3449 2010-10-14 15:46:36 +02:00
Teravus Ovares (Dan Olivares) 46738bbd16 Merge branch 'master' of ssh://MyConnection/var/git/opensim
Conflicts:
	bin/OpenSimDefaults.ini
2010-10-13 20:29:55 -04:00
Teravus Ovares (Dan Olivares) 1a57c65810 * Normalizing endlines so git stops complaining about them being inconsistent.
* People will hate me for updating OpenSimDefaults..   but meh.   Gotta be done or git is unhappy.
2010-10-13 20:26:46 -04:00
Melanie b4c718f93b Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change
.ini.example ";;" format to normal ini format, since the defaults file
is not parsed that way.
2010-10-13 17:07:13 +01:00
Diva Canto 78f6fe0b31 Added missing sections to StandaloneHypergrid.ini 2010-10-09 09:09:16 -07:00
Melanie 1e66f79a4e Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-08 03:09:04 +01:00
dahlia 0d9c94033d move CacheSculptMaps ini flag to OpenSimDefaults.ini
comment it and change defailt to true to reflect code
2010-10-07 19:48:17 -07:00
dahlia 9391c3ffee add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing 2010-10-07 19:34:46 -07:00
Melanie 12bc6a7414 Clarify the format comment at the top of OpenSim.ini.example 2010-10-08 03:08:05 +01:00
Jeff Ames 07122614d5 Formatting cleanup. 2010-10-04 22:44:22 -04:00
Jeff Ames eeca0ee009 Formatting cleanup. 2010-10-04 17:10:07 -04:00
Melanie 0e7e92b67f Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-04 04:49:09 +01:00
Diva Canto 37231e0941 Made the home agent handler check for xff if behind a proxy. 2010-10-03 21:21:02 -07:00
Latif Khalifa 67cfde3fb4 Added Meshmerizer rendering plugin for libomv 2010-10-04 04:48:42 +01:00
Latif Khalifa adc3cfdcdc Removed linden renderer 2010-10-04 04:44:33 +01:00
Latif Khalifa 940246f2d5 Use libomv 0.8.4.3445 2010-10-04 04:44:16 +01:00
Diva Canto 934ae03d44 Made the Gatekeeper proxy-able. 2010-10-03 20:35:26 -07:00
Melanie be301c5815 Add the matching PrimMesher.dll 2010-10-04 01:04:38 +01:00
Diva Canto eb0cde7959 Replaced OpenMetaverse dlls with ones compiled in Windows. 2010-10-03 17:08:09 -07:00
Melanie 766ce9a141 Add linden prim renderer and update libOMV 2010-10-04 00:10:08 +01:00
Diva Canto 72c1b09d57 Upgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex.com/ 2010-10-03 10:35:53 -07:00
Melanie bda02da152 Add the Warp3D dll 2010-10-03 16:58:22 +01:00
BlueWall ffc1123ca5 adding -logconfig to Robust.exe
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
2010-10-01 05:42:18 +01:00
Melanie 14db53b723 Another typo fix 2010-09-26 18:35:15 +01:00
BlueWall b0b4782a2b adding configurable j2kDecodeCache path
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
2010-09-26 17:04:11 +01:00
BlueWall 8afa21cef0 Some cleanup to OpenSimDefaults.ini
Fixing a couple of errors
2010-09-26 17:00:56 +01:00
Melanie 51e03617e9 Changes to preceding patch to make it conform to inifile formats. BLANK LINE
before each comment/option group, and DOUBLE SEMICOLONS before pure text
comments in OpenSim.ini.exemaple
2010-09-26 02:31:37 +01:00
BlueWall 4f25b73b57 Add configurable path to script engine assemblies
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>
2010-09-26 02:30:46 +01:00
Teravus Ovares (Dan Olivares) 33ae5ad309 * Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a slightly modified version of CSharpSqlite built in silverlight mode so that it doesn't have the locking issues that it normally would under .NET and a custom ADO.NET wrapper based on Mono.Data.Sqlite. I'm not entirely sure if these will be kept here like this in debug mode with the pdb's Maybe to start.. but after some testing we'll put them in release mode. 2010-09-23 00:50:18 -04:00
Melanie 58f7a083f9 Add LandServices to make landmarks work right in grids 2010-09-17 22:06:43 +01:00
Melanie f5e3d5a33a Add the modules include line back that i dropped by mistake 2010-09-15 23:24:58 +01:00
Melanie c1ccfa6d8d Mark up OpenSim.ini.example for use with an automatic configuration tool.
Remove seldom changed options from OpenSim.ini.example.
Remove non-overridable settings like [Architecture] from OpenSimDefaults.ini
2010-09-15 20:29:28 +01:00
Melanie 0d034712ba Make AuthorizationService optional and disabled by default. It depends on
external PHP and the default configuration makes it throw for not
having a URL to this PHP
2010-09-15 15:56:03 +01:00
Justin Clark-Casey (justincc) 5d48e3c0bb Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
This reverts commit c3259e9c26.

Reverted by agreement.
2010-09-14 03:30:07 +01:00
Justin Clark-Casey (justincc) 95702129c7 Revert "Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does the work of deciding what users commonly change and what they don't"
This reverts commit fc48eb7b54.

Reverted by agreement.
2010-09-14 03:07:41 +01:00
Justin Clark-Casey (justincc) c3259e9c26 Move OpenSimDefaults,ini into config-include in order to put it with all the other default files 2010-09-14 01:38:53 +01:00
Justin Clark-Casey (justincc) fc48eb7b54 Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does the work of deciding what users commonly change and what they don't 2010-09-14 01:30:12 +01:00
Melanie 51411d5664 add the missing ini example 2010-09-14 00:32:49 +01:00