Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Start implementing Freeswitch in ROBUST | Melanie | 2010-11-21 | 1 | -0/+13 |
| | | |||||
* | | Start implementing Freeswitch in ROBUST | Melanie | 2010-11-21 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-16 | 2 | -0/+6 |
|\ \ | |/ | |||||
| * | Fix: Write asset data into Asset.db when using SQLite | Marck | 2010-11-13 | 2 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-05 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Delete existing presences for a user ID when they log in again. | Melanie | 2010-11-05 | 1 | -0/+3 |
| | | | | | | | | | | | | | | WARNING!!! This changes a default. The old default is to allow multiple presences, the new default disables this. As the feature currently has no users, this should not present any difficulty and will alleviate the presence issues somewhat. | ||||
| * | Fix config items. Less used / expert items go in OpenSimDefaults.ini | Melanie | 2010-11-03 | 2 | -3/+3 |
| | | | | | | | | The default shown is always the hardcoded default | ||||
| * | Admin Server can now bind to a private ip address | mores | 2010-11-03 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Fix config items. Less used / expert items go in OpenSimDefaults.ini | Melanie | 2010-11-03 | 2 | -3/+3 |
| | | | | | | | | The default shown is always the hardcoded default | ||||
* | | Admin Server can now bind to a private ip address | mores | 2010-11-03 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 11 | -17097/+17072 |
|\ \ | |/ | |||||
| * | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 1 | -28/+0 |
| | | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2. | ||||
| * | * Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue. | Teravus Ovares (Dan Olivares) | 2010-10-30 | 7 | -17065/+17065 |
| | | | | | | | | * This is libOMV SVN revision 3463. | ||||
| * | Clarify comment for configuration option Check4096 and show the default value. | Marck | 2010-10-30 | 2 | -3/+5 |
| | | |||||
| * | Set async_packet_handling = true by default | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -1/+2 |
| | | | | | | | | | | | | Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously. Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably. Of course, a lot of login lag is still coming from other sources. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 3 | -1/+15 |
|\ \ | |/ | |||||
| * | Rename the new default texture to be consistent with the others | Melanie | 2010-10-29 | 2 | -1/+1 |
| | | |||||
| * | Add a default alpha layer | Melanie | 2010-10-29 | 1 | -0/+0 |
| | | |||||
| * | 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 |
| | |