Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -48/+69 | |
|\ \ | |/ | ||||||
| * | Reattaching a region was failing if the estate name had not changed (issue ↵ | Kevin Houlihan | 2011-09-16 | 1 | -48/+69 | |
| | | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones. | |||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 3 | -17/+2 | |
|\ \ | |/ | ||||||
| * | Remove code which was automatically deleting non-root prims from scene ↵ | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -15/+0 | |
| | | | | | | | | | | | | | | objects that had previous been attachments. Looks like this code was accidentally uncommented in e1b5c612 from feb 2010. Appears to resolve the rest of http://opensimulator.org/mantis/view.php?id=5664 | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-08-18 | 2 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 10 | -48/+839 | |
|\ \ | |/ | ||||||
| * | Updates to MSSQL to most recent compatibility, also included Windlight ↵ | Chris Hart | 2011-06-01 | 10 | -48/+828 | |
| | | | | | | | | support. Needs plenty of testing but clean install and migration from 0.6.9 have been tested and work, a few indexes still need to be added for performance. | |||||
| * | Fix dumb sql mistake in MSSQLGenericTableHandler.Delete() | Justin Clark-Casey (justincc) | 2011-05-31 | 1 | -1/+1 | |
| | | ||||||
| * | More on HG Friends. Added Delete(string, string) across the board. Added ↵ | Diva Canto | 2011-05-22 | 1 | -0/+5 | |
| | | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back. | |||||
| * | Fixed permissions bug related to friends in PermissionsModule. Added ↵ | Diva Canto | 2011-05-21 | 1 | -0/+6 | |
| | | | | | | | | FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-20 | 2 | -12/+33 | |
|\ \ | |/ | ||||||
| * | Allow item links to be deleted even when other deletes and purges are disabled. | Justin Clark-Casey (justincc) | 2011-05-19 | 2 | -12/+33 | |
| | | | | | | | | | | | | | | If these links are not deleted, then they will build up in the player's inventory until they can no longer log in. Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being accidentally moved. When a link is deleted, the target of the link is never touched. This is a general solution that accounts for the use of links anywhere in the user's inventory. | |||||
| * | Accidentally committed too early | Justin Clark-Casey (justincc) | 2011-05-18 | 2 | -33/+12 | |
| | | | | | | | | | | | | Revert "Allow item links to be deleted even when other deletes and purges are disabled." This reverts commit 491279f99afc65860d44765ee7829c7dd5e4e38e. | |||||
| * | Allow item links to be deleted even when other deletes and purges are disabled. | Justin Clark-Casey (justincc) | 2011-05-17 | 2 | -12/+33 | |
| | | | | | | | | | | | | | | If these links are not deleted, then they will build up in the player's inventory until they can no longer log in. Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being accidentally moved. When a link is deleted, the target of the link is never touched. This is a general solution that accounts for the use of links anywhere in the user's inventory. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -0/+19 | |
|\ \ | |/ | ||||||
| * | Mantis #5470 -- add forgotten MSSQL's GridUserStore. Thank you MrMonkE | Diva Canto | 2011-05-07 | 1 | -0/+19 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 11 | -32/+199 | |
|\ \ | |/ | ||||||
| * | Thank you MrMonkE for a patch that seems to bring the MSSQL data layer up to ↵ | Diva Canto | 2011-04-28 | 11 | -32/+199 | |
| | | | | | | | | speed with 0.7.x. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 1 | -0/+5 | |
|\ \ | |/ | ||||||
| * | Make the "All Estates" option work from the client (this makes chosen ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy! | |||||
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-03-31 | 6 | -10/+8 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -0/+17 | |
|\ \ | |/ | ||||||
| * | On initial region registration, if the user chooses the option to make the ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -0/+17 | |
| | | | | | | | | region part of an existing estate, then list the existing region names. | |||||
* | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 1 | -0/+5 | |
| | | | | | | | | | | | | 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-03 | 1 | -0/+3 | |
|\ \ | |/ | ||||||
| * | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 1 | -0/+3 | |
| | | | | | | | | from a region and allow normal day cycles to be reestablished | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -2/+2 | |
|\ \ | |/ | | | | | | | | | 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 | 1 | -2/+2 | |
| | | | | | | | | MapAndArray collection | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 2 | -4/+23 | |
|\ \ | |/ | | | | | | | 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 | 1 | -3/+3 | |
| |\ | ||||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -3/+3 | |
| | | | ||||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 2 | -0/+19 | |
| |/ | | | | | | | | | * 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 | |||||
| * | Fixed the naming mess around data connectors for simulation data | John Hurliman | 2010-09-11 | 1 | -1/+1 | |
| | | ||||||
| * | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -4/+2 | |
| | | | | | | | | on IDwellModule | |||||
* | | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -4/+2 | |
| | | | | | | | | on IDwellModule | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 1 | -3/+1 | |
|\ \ | |/ | | | | | This was rather conflicted. Please test linking. | |||||
| * | Remove parts locking from data classes since these are using a copy of the ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -49/+45 | |
| | | | | | | | | scene object | |||||
| * | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -46/+48 | |
| | | | | | | | | conditions in linking and unlinking | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 1 | -2/+2 | |
|\ \ | |/ | ||||||
| * | refactor: Use SOP.Flags rather than SOP.ObjectFlags | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -2/+2 | |
| | | ||||||
| * | Thank you, Marck00, for a patch that implemented region distance sorting | Melanie Thielker | 2010-08-08 | 1 | -2/+5 | |
| | | | | | | | | for fallback regions. Applied with changes. | |||||
* | | Thank you, Marck00, for a patch that implemented region distance sorting | Melanie Thielker | 2010-08-08 | 1 | -2/+5 | |
| | | | | | | | | for fallback regions. Applied with changes. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 2 | -8/+23 | |
|\ \ | |/ | ||||||
| * | Merge branch 'moap' | Justin Clark-Casey (justincc) | 2010-08-06 | 2 | -8/+23 | |
| |\ | ||||||
| | * | fix mysql/mssql prim serialization problem | Justin Clark-Casey (justincc) | 2010-08-04 | 1 | -6/+2 | |
| | | | ||||||
| | * | Implement MediaUrl persistence for MySQL and MsSQL | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -4/+10 | |
| | | | | | | | | | | | | Not sure how I forgot this. This may resolve problems with media textures not persisting over restart for these databases. | |||||
| | * | get rid of PrimitiveBaseShape.MediaRaw staging post | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself | |||||
| | * | add mssql support for media on a prim | Justin Clark-Casey (justincc) | 2010-07-26 | 2 | -4/+15 | |
| | | | | | | | | | | | | compiles but not tested. please test and correct if necessary! | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-01 | 1 | -14/+13 | |
|\ \ \ | |/ / | ||||||
| * | | White space from previous commit. | Diva Canto | 2010-07-31 | 1 | -27/+27 | |
| | | |