Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 7 | -9/+26 |
|\ | |||||
| * | Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that ↵ | Diva Canto | 2010-04-26 | 1 | -0/+0 |
| | | | | | | | | makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows. | ||||
| * | Add instructions for using SQLiteNG to OpenSim.ini and ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 3 | -4/+26 |
| | | | | | | | | | | | | config-include/StandaloneCommon.ini Unfortunately, database settings need to be changed in two places. | ||||
| * | remove [DatabaseService] section from OpenSim.ini since this is always ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -4/+0 |
| | | | | | | | | present in included configuration files | ||||
| * | minor: eliminate configuration section handling deprecation of ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -1/+0 |
| | | | | | | | | OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time | ||||
| * | Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config. | Diva Canto | 2010-04-22 | 3 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 2 | -0/+32 |
|\ \ | |/ | |||||
| * | This version of the launcher exe works. | Diva Canto | 2010-04-14 | 1 | -0/+0 |
| | | |||||
| * | * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine. | Diva Canto | 2010-04-14 | 2 | -0/+32 |
| | | | | | | | | * PrimitiveBaseShape wants to be be committed too -- EOF. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-05 | 3 | -3/+27 |
|\ \ | |/ | |||||
| * | Updates to config files for groups | unknown | 2010-04-04 | 3 | -3/+27 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | Adding the configuration example | Melanie | 2010-03-31 | 1 | -0/+6 |
| | | |||||
* | | Rename Meta7Windlight to LightShare | Melanie | 2010-03-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 5 | -0/+0 |
|\ \ | |/ | |||||
| * | Hippos with bin/Newtonsoft.Json.XML | Diva Canto | 2010-03-26 | 1 | -5827/+5827 |
| | | |||||
| * | put out full exception stack if something reaches top of base http server ↵ | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -5827/+5827 |
| | | | | | | | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit | ||||
| * | * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ↵ | John Hurliman | 2010-03-20 | 5 | -0/+0 |
| | | | | | | | | | | | | and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll * Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate() | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 2 | -8/+1 |
|\ \ | |/ | |||||
| * | Removed the unused use_async_when_possible config variable | John Hurliman | 2010-03-16 | 1 | -7/+0 |
| | | |||||
| * | Fixed a bad module name in SimianGrid.ini | John Hurliman | 2010-03-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 10 | -463/+5379 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-12 | 1 | -18/+22 |
| |\ | |||||
| | * | start laoding griduser local connector, though it isn't invoked by anything yet | Justin Clark-Casey (justincc) | 2010-03-12 | 1 | -18/+22 |
| | | | |||||
| * | | * Added a better check to the SimianGrid connectors to test if they are ↵ | John Hurliman | 2010-03-12 | 3 | -5827/+5827 |
| |/ | | | | | | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET | ||||
| * | Simplify database setup and remove migration problems by moving all sqlite ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 3 | -13/+30 |
| | | | | | | | | | | | | | | | | | | config-include settings to a separate file for standalone Update information in StandaloneCommon.ini.example to reflect this Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.). Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-12 | 2 | -0/+58 |
| |\ | |||||
| | * | Fixed SimianGrid.ini to use GridCommon.ini(.example) | John Hurliman | 2010-03-12 | 1 | -34/+21 |
| | | | |||||
| | * | Adding the SimianGrid connectors | John Hurliman | 2010-03-11 | 2 | -0/+71 |
| | | | |||||
| * | | Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6 | Justin Clark-Casey (justincc) | 2010-03-11 | 3 | -990/+5827 |
| |/ | | | | | | | Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-09 | 5 | -2/+4 |
|\ \ | |/ | |||||
| * | Add config option for switching between CSJ2K and BuggyJPEG. | Melanie | 2010-03-08 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-07 | 1 | -2/+0 |
| |\ | |||||
| | * | Removed obsolete configs. | Diva Canto | 2010-03-07 | 1 | -2/+0 |
| | | | |||||
| * | | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit ↵ | John Hurliman | 2010-03-07 | 3 | -0/+0 |
| |/ | | | | | | | systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-06 | 2 | -0/+0 |
|\ \ | |/ | |||||
| * | revert accidental Standalone.ini change | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -9/+10 |
| | | |||||
| * | add initial UserGrid service classes as per diva's direction | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -10/+9 |
| | | | | | | | | | | this will initially store home location data instead of the presence service compiles but not enough to actually test yet | ||||
| * | Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This ↵ | Diva Canto | 2010-03-04 | 2 | -0/+0 |
| | | | | | | | | solves the compilation errors that have been affecting build on Windows for the past day. Thanks lkalif for noticing the conflict. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-04 | 1 | -3/+5 |
|\ \ | |/ | |||||
| * | reset the accidental local configuration changes | Justin Clark-Casey (justincc) | 2010-03-03 | 2 | -8/+10 |
| | | |||||
| * | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-03 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 3 | -46/+93 |
|\ \ | |/ | |||||
| * | * Better debug message on login problems. | Diva Canto | 2010-03-02 | 3 | -46/+93 |
| | | | | | | | | * Moved GridInfoService config to OpenSim.Server.ini | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 12 | -208/+529 |
|\ \ | |/ | | | | | This brings careminster on the level of master. To be tested | ||||
| * | Merge branch 'master' into presence-refactor | Melanie | 2010-03-01 | 2 | -34/+33 |
| |\ | |||||
| | * | Minor formatting cleanup. | Jeff Ames | 2010-02-22 | 2 | -36/+35 |
| | | | |||||
| * | | Added FriendsData to both Null storage and SQLite. Untested. | Diva Canto | 2010-02-28 | 2 | -0/+8 |
| | | | |||||
| * | | * Friends out connector completed. Grid login retrieves friends correctly. | Diva Canto | 2010-02-26 | 5 | -4/+19 |
| | | | | | | | | | | | | * Added friends configs to grid .inis | ||||
| * | | Added server-side Friends in connector. Untested. | Diva Canto | 2010-02-25 | 4 | -0/+8 |
| | | | |||||
| * | | List of friends now retrieved upon login. Configured and tested in ↵ | Diva Canto | 2010-02-25 | 2 | -3/+11 |
| | | | | | | | | | | | | standalone only. |