| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 1 | -1/+1 |
|\ |
|
| * | Bump OPenSimulator version and assembly versions up to 0.8.0 Dev | Justin Clark-Casey (justincc) | 2013-10-04 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-09-07 | 1 | -0/+5 |
|\ \
| |/ |
|
| * | Allow one to specify a DefaultHGRegion flag in [GridService] in order to allo... | Justin Clark-Casey (justincc) | 2013-09-02 | 1 | -0/+5 |
* | | Merge branch 'master' into careminster | Melanie | 2013-07-24 | 1 | -3/+17 |
|\ \
| |/ |
|
| * | Enable storing of environment settings in NullSimulationData | Dan Lake | 2013-07-18 | 1 | -3/+17 |
* | | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 1 | -7/+21 |
|\ \
| |/ |
|
| * | Enhance NullEstateData to remember stored estate values and return | Robert Adams | 2013-07-11 | 1 | -7/+21 |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -20/+44 |
|\ \
| |/ |
|
| * | Added locking in NullRegionData. | Oren Hurvitz | 2013-01-02 | 1 | -20/+44 |
* | | Merge branch 'master' into careminster | Melanie | 2012-12-09 | 1 | -0/+8 |
|\ \
| |/ |
|
| * | Restrict IPresenceData.VerifyAgent | BlueWall | 2012-12-09 | 1 | -8/+3 |
| * | Add agent verification to Presence | BlueWall | 2012-12-08 | 1 | -0/+13 |
* | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 2 | -0/+157 |
|\ \
| |/ |
|
| * | Fix bug where loading an OAR with a deeded parcel would always set the parcel... | Justin Clark-Casey (justincc) | 2012-11-24 | 2 | -0/+157 |
* | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't hav... | Diva Canto | 2012-11-13 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Disambiguate use of RegionFlags in NullRegionData | Justin Clark-Casey (justincc) | 2012-10-09 | 1 | -0/+1 |
| * | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 1 | -0/+13 |
* | | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 1 | -0/+13 |
* | | Merge branch 'avination' into careminster | Melanie | 2012-06-11 | 1 | -0/+5 |
|\ \ |
|
| * | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDs | Melanie | 2012-06-07 | 1 | -0/+5 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-27 | 1 | -2/+20 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Environment Module - allows Environment settings for Viewer3 warning: include... | PixelTomsen | 2012-05-23 | 1 | -0/+18 |
| * | Format cleanup | BlueWall | 2012-05-23 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 2 | -19/+56 |
|\ \
| |/ |
|
| * | Lock NullFriendsData.m_Data for consistency and against concurrent read/write | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -30/+39 |
| * | Add simple login test with online friends. Add IFriendsModule.GrantRights() ... | Justin Clark-Casey (justincc) | 2012-03-30 | 2 | -2/+30 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -9/+31 |
|\ \
| |/ |
|
| * | Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -9/+31 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -1/+9 |
|\ \
| |/ |
|
| * | Add test for adding a friend whilst online | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -1/+9 |
* | | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+4 |
|\ \
| |/ |
|
| * | Null simulation data must return a non-null region settings or other parts of... | Dan Lake | 2011-09-20 | 1 | -2/+4 |
* | | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+5 |
|\ \
| |/ |
|
| * | Reattaching a region was failing if the estate name had not changed (issue 50... | Kevin Houlihan | 2011-09-16 | 1 | -0/+5 |
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+4 |
|\ \
| |/ |
|
| * | Fix unit tests from RegionSettings commit | Justin Clark-Casey (justincc) | 2011-09-09 | 1 | -0/+4 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -1/+1 |
| * | minor: a little bit of log message correction/commenting out | Justin Clark-Casey (justincc) | 2011-08-11 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -4/+14 |
|\ \
| |/ |
|
| * | More on HG Friends. Added Delete(string, string) across the board. Added secu... | Diva Canto | 2011-05-22 | 1 | -1/+6 |
| * | Fixed permissions bug related to friends in PermissionsModule. Added FriendsD... | Diva Canto | 2011-05-21 | 1 | -1/+6 |
| * | HG Friends working to some extent: friendships offered and accepted correctly... | Diva Canto | 2011-05-19 | 1 | -2/+2 |