Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-16 | 2 | -0/+0 |
|\ | |||||
| * | Catch HttpServer exception: mantis #5381 | Diva Canto | 2011-02-15 | 2 | -0/+0 |
| | | |||||
| * | Fixed a couple of tests in the HttpServer. Not sure if this is enough. ↵ | Diva Canto | 2011-02-12 | 2 | -0/+0 |
| | | | | | | | | Mantis #5373 and #5384 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-12 | 2 | -0/+3 |
|\ \ | |/ | |||||
| * | In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row ↵ | Justin Clark-Casey (justincc) | 2011-02-11 | 1 | -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] setting | Justin Clark-Casey (justincc) | 2011-02-11 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 4 | -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 Canto | 2011-02-04 | 3 | -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-03 | 1 | -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-refactor | Melanie | 2011-01-29 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Add groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -0/+5 |
| | | |||||
* | | Revert "Replace the new, tricky MySql.Data.dll with the older version from ↵ | Melanie | 2011-01-14 | 1 | -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" | Melanie | 2011-01-14 | 3 | -4/+4 |
| | | | | | | | | This reverts commit 52222d82d50cbeb7f709142e37421c6cef490706. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-13 | 1 | -0/+0 |
|\ \ | |/ | |||||
| * | Make FireAndForgetWrapper a singleton class | BlueWall | 2011-01-13 | 1 | -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 Grid | Mic Bowman | 2011-01-08 | 1 | -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' sake | Melanie | 2011-01-11 | 3 | -4/+4 |
| | | |||||
* | | Replace the new, tricky MySql.Data.dll with the older version from 0.6.9 | Melanie | 2011-01-11 | 1 | -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-refactor | Melanie | 2010-12-30 | 4 | -3/+9 |
|\ \ | |/ | |||||
| * | WARNING: simulator config var change! This affects only system-facing ↵ | Diva Canto | 2010-12-27 | 4 | -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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-20 | 3 | -2989/+2989 |
|\ \ | |/ | |||||
| * | Replaced the HttpServer_OpenSim.dll with one compiled for .NET 3.5 (the last ↵ | Diva Canto | 2010-12-18 | 3 | -2989/+2989 |
| | | | | | | | | one was 4.0, and that doesn't work). Also added the corresponding .xml and .pdb, if that makes any difference. | ||||
| * | Replaced HttpServer_OpenSim.dll with a version that locks certain ops in ↵ | Diva Canto | 2010-12-18 | 1 | -0/+0 |
| | | | | | | | | HttpForm -- mantis #5128. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-17 | 18 | -24/+15 |
|\ \ | |/ | |||||
| * | remove now unused subversion serialization backup config | Justin Clark-Casey (justincc) | 2010-12-17 | 1 | -12/+3 |
| | | |||||
| * | remove broken and unmaintained subversion serialization module and it's ↵ | Justin Clark-Casey (justincc) | 2010-12-17 | 16 | -0/+0 |
| | | | | | | | | associated libraries and licenses | ||||
| * | tidy up the [Groups] section in OpenSim.ini.example | Justin Clark-Casey (justincc) | 2010-12-17 | 2 | -12/+12 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 1 | -0/+0 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | justincc | 2010-12-15 | 8 | -27/+53 |
| |\ | |||||
| * | | replace ode.dll with one built without asserts turned on | justincc | 2010-12-15 | 1 | -0/+0 |
| | | | |||||
| * | | Update ode.dll to r1755 | justincc | 2010-12-09 | 1 | -0/+0 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 5 | -7/+25 |
|\ \ \ | | |/ | |/| | |||||
| * | | Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. | Marck | 2010-12-13 | 5 | -7/+25 |
| | | | | | | | | | | | | | | | | | | Configuration option AssetService in section [GridService] must be set to enable this functionality. Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -3/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed wrong configuration variable names. | Diva Canto | 2010-12-11 | 1 | -3/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 6 | -17/+27 |
|\ \ \ | |/ / | |||||
| * | | update libode for 64 bit linux to r1755 (post 0.11.1) from ode 0.10.1 | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -0/+0 |
| | | | | | | | | | | | | the same thing was actually done for ode.dll a couple of commits ago but I got the commit msg wrong (should have been r1755, not r1754). Damn these fat fingers. | ||||
| * | | Make configs consistent, as per mantos #5258 | Diva Canto | 2010-12-09 | 3 | -17/+27 |
| | | | |||||
| * | | Update ode.dll to r1754 | justincc | 2010-12-09 | 1 | -0/+0 |
| |/ | |||||
| * | Update libode.so to r1755. | Justin Clark-Casey (justincc) | 2010-12-09 | 1 | -0/+0 |
| | | | | | | | | | | This revision dates from 02 Sep 2010 and has received some testing. This code will be updated in the opensim-libs repository Updates for libode-x86_64, ode.dll and libode.dylib will follow | ||||
| * | Remove old Freeswitch configurations | Melanie | 2010-12-07 | 1 | -33/+0 |
| | | |||||
* | | Remove old Freeswitch configurations | Melanie | 2010-12-07 | 1 | -33/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 10 | -134/+52 |
|\ \ | |/ | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| * | Only force prim persistence before delete if the prim is the result of an ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 1 | -0/+2 |
| | | | | | | | | | | | | unpersisted delink This considerably improves delete performance for objects with large linksets | ||||
| * | Deleted obsolete config files from old OpenSim.Grid. | Diva Canto | 2010-12-01 | 5 | -121/+0 |
| | | |||||
| * | Creator information preserved upon HG transfers. | Diva Canto | 2010-11-26 | 2 | -0/+10 |
| | | |||||
| * | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 3 | -13/+40 |
| | | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-21 | 2 | -40/+29 |
|\ \ | |/ | |||||
| * | Finish the standalone mode freeswitch work and add config examples | Melanie | 2010-11-21 | 2 | -39/+28 |
| | | |||||
| * | Correct an error in Robust.ini.example | Melanie | 2010-11-21 | 1 | -1/+1 |
| | |