aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-172-11/+14
|\
| * Add ColladaMesh switchBlueWall2011-04-141-1/+5
| |
| * Move example HttpProxy setting to OpenSim.ini.example and tidyJustin Clark-Casey (justincc)2011-04-122-9/+8
| |
| * minor typo correction. thanks Ai Austin.Justin Clark-Casey (justincc)2011-04-121-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-123-48/+90
|\ \ | |/
| * slightly tweak OpenSim.ini.example textJustin Clark-Casey (justincc)2011-04-111-2/+2
| |
| * Add information comment to top of OpenSimDefaults.ini and make file consistentJustin Clark-Casey (justincc)2011-04-111-13/+22
| |
| * Add more instructions to OpenSim.ini.example to try and make it more ↵Justin Clark-Casey (justincc)2011-04-111-35/+68
| | | | | | | | understandable for new users.
| * Update ODE for mac from source code in opensim-libs SVN library. This ↵Justin Clark-Casey (justincc)2011-04-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | version is r1755 + patches as detailed in the svn logs. This brings it into line with the Windows and Linux libraries. This is a universal dylib with x86_64, i386 and ppc parts. However, even on a 64 bit Intel machine Mono can only P/INVOKE the i386 version right now. ppc is untested. The configuration used to compile was CFLAGS="-g -O2 -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc" CXXFLAGS="-g -O2 -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc" LDFLAGS="-arch i386 -arch x86_64 -arch ppc" ./configure --enable-old-trimesh --disable-asserts --enable-shared --disable-dependency-tracking --disable-demos --without-x --disable-demos --without-x is required to build ODE on Mac OS X CFLAGS, CXXFLAGS and --disable-dependency-tracking are necessary to build the universal dylib (some compilation lines use CFLAGS instead of CXXFLAGS) The other settings are tweaks for using ODE with OpenSim
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-086-30/+1
|\ \ | |/
| * Remove old SQLite libraryJustin Clark-Casey (justincc)2011-04-081-0/+0
| |
| * Remove the SQLite legacy adaptor. This is no longer needed now that the ↵Justin Clark-Casey (justincc)2011-04-073-30/+0
| | | | | | | | | | | | main adaptor works on Mac OS X. The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.
| * Bundle a built-from-source Mac OS X sqlite3 universal dylib with OpenSim and ↵Justin Clark-Casey (justincc)2011-04-072-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | use this instead of the system one. This means that Mac OS X users can now use the standard sqlite adaptor instead of the legacy one. This is SQLite 3.7.5. I configured the build with the line CFLAGS="-Os -g -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc7400 -DSQLITE_ENABLE_COLUMN_METADATA" LDFLAGS="-arch i386 -arch x86_64 -arch ppc7400" ./configure --disable-dependency-tracking The SQLITE_ENABLE_COLUMN_METADATA flag exports the metadata symbols that modern Mono SQLite adaptors need. The -Os removes debugging symbols (as per the sqlite3 source pkg README) The other parts are to cross compile for x86_64, i386 and ppc. On Mac OS X, Mono can actually only P/INVOKE 32-bit libraries even on 64 bit platforms so i386 is being used. The dylib has not been tested on ppc.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-013-2/+13
|\ \ | |/
| * Fix mantis #5413. WARNING: new config variable in section [GridService] of ↵Diva Canto2011-03-282-0/+11
| | | | | | | | the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples.
| * More touchup for SQLite.Marck2011-03-281-1/+1
| | | | | | | | Apply the same change to both the 32-bit and 64-bit DLL target paths. This makes the previous addition to the instructions in the README for running on Linux unnecessary.
| * Touchup for SQLiteBlueWall2011-03-271-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-273-0/+4
|\ \ | |/
| * Fix a typo in the SQLite DLL config and amend the instructions for running ↵Marck2011-03-231-1/+1
| | | | | | | | | | | | on Linux. Under Linux (and probably also under OSX), the operating system must be able to find the new SQLite DLL in the library search path.
| * Typo fixBlueWall2011-03-221-1/+1
| |
| * More SQLite work.BlueWall2011-03-223-0/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-213-0/+1
|\ \ | |/
| * Upgrade SQLite:BlueWall2011-03-183-0/+1
| | | | | | | | | | Fixes metadata issues. Tested on Linux and Windows - may fix issues seen on OSx as well.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-102-0/+0
|\ \ | |/
| * Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-091-0/+0
| | | | | | | | This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
| * Update MySql.Data.dll to version 6.3.6.Justin Clark-Casey (justincc)2011-03-091-0/+0
| | | | | | | | | | This version fixes a bug so that MySqlCommand.CommandTimeout = 0 now correctly sets an infinite command timeout. This might help with failures on long-running migrations. The mysql.data.dll v2 is used from the mysql package (as opposed to v4). The v4 version (probably standing for NET 4.0) does not work under mono 2.6.7, which is still commonly used.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-241-0/+7
|\ \ | |/
| * Parameterizes the view distance used to compute and manageMic Bowman2011-02-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | child agents in neighbor regions. This means you can extend the view on a simulator beyond the default 3x3 regions. This uses a region default draw distance and should be replaced at some point by the avatar specified draw distance. That will require more careful, dynamic recomputation of child agents every time the draw distance changes. WARNING: this is experimental and has known instabilities. specifically all regions "within site" should be running the same default draw distance or agents will not be closed correctly.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-193-3/+3
|\ \ | |/
| * Changed default directory for storing map tile images from remote regions.Marck2011-02-163-3/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-162-0/+0
|\ \ | |/
| * Catch HttpServer exception: mantis #5381Diva Canto2011-02-152-0/+0
| |
| * Fixed a couple of tests in the HttpServer. Not sure if this is enough. ↵Diva Canto2011-02-122-0/+0
| | | | | | | | Mantis #5373 and #5384
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-122-0/+3
|\ \ | |/
| * In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row ↵Justin Clark-Casey (justincc)2011-02-111-0/+0
| | | | | | | | | | | | | | | | from the data adaptor's Rows list in addition to calling Delete. This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication). Probably a holdover from copying code from the older legacy adaptor. Resolves http://opensimulator.org/mantis/view.php?id=5361
| * minor: Add some more information to the mesh_sculpted_prim [PHYSICS] settingJustin Clark-Casey (justincc)2011-02-111-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-074-0/+28
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs
| * Added a config var to HGInventoryAccessModule called OutboundPermission that ↵Diva Canto2011-02-043-0/+19
| | | | | | | | controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things...
| * Make UUID 3a367d1c-bef1-6d43-7595-e88c1e3aadb3 reference a full alpha texture.Justin Clark-Casey (justincc)2011-02-031-0/+9
| | | | | | | | | | | | | | | | SL's viewer and some downstream projects assume that this UUID points to a full alpha texture, as per http://opensimulator.org/mantis/bug_view_advanced_page.php?bug_id=4751 and http://forums.kokuaviewer.org/viewtopic.php?f=8&t=1323 If the request isn't satified, some viewers will continuously make the request.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-291-0/+5
|\ \ | |/
| * Add groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-01-281-0/+5
| |
* | Revert "Replace the new, tricky MySql.Data.dll with the older version from ↵Melanie2011-01-141-0/+0
| | | | | | | | | | | | | | | | | | 0.6.9" This reverts commit e5ce59ff34351612980e70a25ed978dd90ebe593. The old module causes a truly massive (double!) rise in connections. Please put "old guids=true;" back in after this commit
* | Revert "Remove old guids from the examples, for completeness' sake"Melanie2011-01-143-4/+4
| | | | | | | | This reverts commit 52222d82d50cbeb7f709142e37421c6cef490706.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-131-0/+0
|\ \ | |/
| * Make FireAndForgetWrapper a singleton classBlueWall2011-01-131-0/+0
| | | | | | | | | | | | Made FireAndForgetWrapper a singleton class to allow us to drop dependancy on the BclExtras35 library. BclExtras is broken in Mono 2.8.2 and we used the library in only one function.
| * Moved the map tile processing used by the Simian GridMic Bowman2011-01-081-0/+8
| | | | | | | | | | | | Frontend into a separate region module. Configuration settings added to the defaults ini file. Others may find this useful for pushing map tiles to a separate server.
* | Remove old guids from the examples, for completeness' sakeMelanie2011-01-113-4/+4
| |
* | Replace the new, tricky MySql.Data.dll with the older version from 0.6.9Melanie2011-01-111-0/+0
| | | | | | | | | | | | This requires REMOVING the "Old Guids=true" fromt he MYSQL connection strings! Sorry for the inconvenience, but this version of the DLL is much less buggy than the new one for production use.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-304-3/+9
|\ \ | |/
| * WARNING: simulator config var change! This affects only system-facing ↵Diva Canto2010-12-274-3/+9
| | | | | | | | | | | | configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini. Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.