Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-12 | 1 | -6/+0 |
|\ | |||||
| * | In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row ↵ | Justin Clark-Casey (justincc) | 2011-02-11 | 1 | -6/+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 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Also fix MySQLXInventoryData | Melanie | 2011-01-18 | 1 | -1/+1 |
| | | |||||
| * | Prevent activation and deactivation of gestures from clobbering the slam | Melanie | 2011-01-18 | 1 | -1/+1 |
| | | | | | | | | bits | ||||
* | | Prevent activation and deactivation of gestures from clobbering the slam | Melanie | 2011-01-18 | 1 | -1/+1 |
| | | | | | | | | bits | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 2 | -2/+9 |
|\ \ | |/ | |||||
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 2 | -2/+9 |
| | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Another attempt at fixing failing test for creator info. | Marck | 2010-11-26 | 1 | -2/+2 |
| | | |||||
* | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 6 | -0/+36 |
| | | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-25 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Attempt at fixing failing test. | Diva Canto | 2010-11-23 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-23 | 2 | -0/+6 |
|\ \ | |/ | |||||
| * | Fix joining land parcels not being stored correctly in SQLite. Thank you to ↵ | Marck | 2010-11-23 | 2 | -0/+6 |
| | | | | | | | | goetz for the initial patch in Mantis #5230. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 7 | -16/+33 |
|\ \ | |/ | |||||
| * | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 7 | -10/+19 |
| | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255). | ||||
| * | Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still ↵ | Diva Canto | 2010-11-21 | 1 | -2/+2 |
| | | | | | | | | used?!? | ||||
| * | Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of ↵ | Diva Canto | 2010-11-21 | 1 | -2/+2 |
| | | | | | | | | SOP.CreatorID. Untested, but should work. | ||||
| * | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 2 | -2/+10 |
| | | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 5 | -0/+28 |
|\ \ | |/ | |||||
| * | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 5 | -0/+27 |
| | | | | | | | | from a region and allow normal day cycles to be reestablished | ||||
| * | When LightShare is enabled, the standard day cycle is bypassed and replaced by | Melanie | 2010-11-03 | 1 | -0/+1 |
| | | | | | | | | | | | | midday defaults when no specific LightShare profile is set. This prevents LightShare info being send out when the region has no LightShare profile, allowing normal day/night cycles to happen. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 1 | -0/+8 |
| | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Alphabetize results on region search by prefix matching | Melanie | 2010-10-18 | 1 | -0/+2 |
| | | |||||
| * | Bump migration version on LastSeen field so it is actually run | Melanie | 2010-10-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | UPdated the MySql driver to 6.2.4. Also established a much larger ↵ | Diva Canto | 2010-10-15 | 1 | -0/+1 |
| | | | | | | | | MySqlCommand timeout on fetching prims. | ||||
| * | fix build break | Justin Clark-Casey (justincc) | 2010-10-13 | 1 | -1/+1 |
| | | |||||
| * | Correctly update the LastSeen field | Melanie Thielker | 2010-10-13 | 1 | -1/+1 |
| | | |||||
| * | Ensure no UUID.Zero region ID is ever written to presence. Add a Migration | Melanie Thielker | 2010-10-13 | 2 | -1/+11 |
| | | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 12 | -15/+72 |
|\ \ | |/ | |||||
| * | * One more item for CSharpSqlite | Teravus Ovares (Dan Olivares) | 2010-09-23 | 1 | -3/+10 |
| | | | | | | | | | | | | | | * Hopefully this will enable mac people to use SQLite again * Someone cooler then me will need to figure out how to define CSharpSqlite with Mono so the conditional will pick up. * There's also an error that occurs when you first load OpenSimulator under CSharpSQLite that goes away after. * The databases are not byte for byte compatible. Mono.Data.Sqlite is able to read CSharpSqlite made databases but not the reverse way. | ||||
| * | * Add CSharpSqlite to prebuild | Teravus Ovares (Dan Olivares) | 2010-09-23 | 12 | -12/+62 |
| | | | | | | | | | | | | | | | | | | | | * Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite #if CSharpSqlite using Community.CsharpSqlite.Sqlite; #else using Mono.Data.Sqlite; #endif * Hopefully, this will restore sqlite functionality on a Mac. In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box. I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Improve the explanative text of migration failures | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -3/+3 |
| | | | | | | | | When running for the first time, people see migration failures because of sql statements that are trying to move data from old tables (e.g. users). The amended text attempts to calm their nerves. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 5 | -12/+12 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 5 | -12/+12 |
| | | | | | | | | MapAndArray collection | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 20 | -106/+254 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | Merged | John Hurliman | 2010-09-12 | 10 | -65/+170 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 8 | -61/+58 |
| | | | |||||
| | * | Add copyright headers. | Jeff Ames | 2010-09-12 | 4 | -4/+112 |
| | | | |||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 8 | -0/+73 |
| |/ | | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings | ||||
| * | Changed all string references of "IRegionDataStore" to "ISimulationDataStore" | John Hurliman | 2010-09-11 | 3 | -5/+0 |
| | | |||||
| * | Fixed the naming mess around data connectors for simulation data | John Hurliman | 2010-09-11 | 6 | -11/+11 |
| | | |||||
| * | Re-enabled asset last access time logging in MySQL | John Hurliman | 2010-09-11 | 1 | -3/+0 |
| | |