Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 8 | -68/+97 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 8 | -68/+97 | |
| | | | | | | | | | | | | | | | | | | | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs. | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-06 | 3 | -1/+8 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | * Fixes Library bugs in grid mode. Partly a missing check and partly a ↵ | Diva Canto | 2010-05-05 | 3 | -1/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | missing configuration. * Made previous Robust config changes consistent in Robust.HG.ini.example | |||||
| * | | | Add a XMLRPC method to remotely set the login level for the LLLoginService. | Melanie Thielker | 2010-05-05 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This requires a special XMLRPC call, which has to supply the credentials of a god user (User level >= 200). Disabled by default. Also Adds a configuration option to set the initial permitted login level. | |||||
* | | | | Add a XMLRPC method to remotely set the login level for the LLLoginService. | Melanie Thielker | 2010-05-05 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This requires a special XMLRPC call, which has to supply the credentials of a god user (User level >= 200). Disabled by default. Also Adds a configuration option to set the initial permitted login level. | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-03 | 7 | -21/+23 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Switched everything to XInventory by default. The old Inventory is still ↵ | Diva Canto | 2010-05-02 | 7 | -21/+23 | |
| | | | | | | | | | | | | | | | | there for now, in case bugs pop up with XInventory. | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-30 | 3 | -8/+12 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -0/+0 | |
| |\ \ \ | ||||||
| * | | | | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy | Justin Clark-Casey (justincc) | 2010-04-30 | 3 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone) See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita. | |||||
| * | | | | Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux. | Justin Clark-Casey (justincc) | 2010-04-30 | 2 | -9/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | I know this is tough on Mac OSX users (since SQLiteNG requires the export of the sqlite3_column_origin_name symbol and this isn't present for the Mac OSX sqlite3 system library) Unfortunately, I need to shaft somebody (as it were) | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-29 | 1 | -0/+0 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | update Mono.Data.Sqlite.dll to the one that shipped with Mono 2.6.3, which ↵ | justincc | 2010-04-27 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is the one known to work in Windows Thanks for the initial library inclusion, Diva. I had it all queued up on my windows test machine but forgot to add it! | |||||
* | | | | | 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 | |
| | | | |