| Commit message (Expand) | Author | Age | Files | Lines |
* | Plug a security hole in the inventory service | Melanie | 2011-10-31 | 1 | -1/+2 |
* | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge | Melanie | 2011-10-11 | 1 | -23/+0 |
|\ |
|
| * | Remove vestigal OpenSim.Data mono addins extension points that don't look lik... | Justin Clark-Casey (justincc) | 2011-09-20 | 1 | -23/+0 |
* | | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -44/+79 |
|\ \
| |/ |
|
| * | Reattaching a region was failing if the estate name had not changed (issue 50... | Kevin Houlihan | 2011-09-16 | 1 | -44/+79 |
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | Save the default terrain texture UUIDs for a new region instead of leaving th... | Justin Clark-Casey (justincc) | 2011-09-09 | 1 | -1/+0 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -19/+7 |
|\ \
| |/ |
|
| * | Remove code which was automatically deleting non-root prims from scene object... | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -17/+0 |
| * | In the asset service, check that an asset exists before attempting to store it. | Justin Clark-Casey (justincc) | 2011-08-17 | 1 | -2/+7 |
* | | Allow removing users from search and avatar picker | Melanie | 2011-07-31 | 1 | -2/+2 |
* | | Don't store the default WL profile. This will prevent "valid" from being | Melanie | 2011-07-05 | 1 | -1/+1 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2011-06-20 | 3 | -0/+37 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| | * | Switched order of SQL statements in Friends migration -- resulted in the wron... | Diva Canto | 2011-06-11 | 1 | -1/+1 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -0/+16 |
| |\ \
| | |/ |
|
| | * | For MySQL, migrate region tables to the MyISAM storage engine rather than InnoDB | Justin Clark-Casey (justincc) | 2011-06-10 | 1 | -0/+16 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -0/+21 |
| |\ \
| | |/ |
|
| | * | This is the better solution: make the combined key be only on the first 36 ch... | Diva Canto | 2011-06-01 | 1 | -1/+2 |
| | * | It looks like there's a better solution for that problem. | Diva Canto | 2011-06-01 | 1 | -2/+1 |
| | * | Changed Friends table to have 165-sized varchars on PrincipalID and FriendID.... | Diva Canto | 2011-06-01 | 1 | -1/+2 |
| | * | More on HG Friends. Added Delete(string, string) across the board. Added secu... | Diva Canto | 2011-05-22 | 1 | -4/+13 |
| | * | Fixed permissions bug related to friends in PermissionsModule. Added FriendsD... | Diva Canto | 2011-05-21 | 1 | -0/+5 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-05-21 | 2 | -6/+31 |
| | |\ |
|
| | * | | HG Friends working to some extent: friendships offered and accepted correctly... | Diva Canto | 2011-05-19 | 1 | -0/+6 |
* | | | | Add some flags to control content in search better | Melanie | 2011-06-20 | 1 | -2/+7 |
|/ / / |
|
* | | | Add a missing virtual keyword | Melanie | 2011-05-20 | 1 | -1/+1 |
* | | | Make public interface methods in MySQLSimulation data virtual so the CM | Melanie | 2011-05-20 | 1 | -14/+14 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-20 | 2 | -6/+31 |
|\ \ \
| | |/
| |/| |
|
| * | | Allow item links to be deleted even when other deletes and purges are disabled. | Justin Clark-Casey (justincc) | 2011-05-19 | 2 | -6/+31 |
| |/ |
|
| * | Accidentally committed too early | Justin Clark-Casey (justincc) | 2011-05-18 | 2 | -31/+6 |
| * | Allow item links to be deleted even when other deletes and purges are disabled. | Justin Clark-Casey (justincc) | 2011-05-17 | 2 | -6/+31 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 5 | -6/+6 |
|\ \
| |/ |
|
| * | remove further mono compiler warnings | Justin Clark-Casey (justincc) | 2011-05-06 | 5 | -6/+6 |
* | | Honor agent limit for region crossings and teleports | Melanie | 2011-04-21 | 1 | -10/+14 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -2/+13 |
|\ \
| |/ |
|
| * | Include code to return more information about the NullReferenceException seen in | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -2/+13 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 1 | -0/+30 |
|\ \
| |/ |
|
| * | Make the "All Estates" option work from the client (this makes chosen changes... | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -0/+30 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -0/+40 |
|\ \
| |/ |
|
| * | On initial region registration, if the user chooses the option to make the re... | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -0/+40 |
* | | Change avatar picker search to work properly when two name parts are used | Melanie | 2011-03-12 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 6 | -11/+39 |
|\ \
| |/ |
|
| * | Pull up Assembly of the MySQL classes as a protected property, so that it can... | Diva Canto | 2011-03-08 | 6 | -11/+39 |
* | | 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 |
* | | Prevent activation and deactivation of gestures from clobbering the slam | Melanie | 2011-01-18 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 2 | -2/+9 |
|\ \
| |/ |
|
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. Cha... | Diva Canto | 2010-12-05 | 2 | -2/+9 |