Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 4 | -47/+94 |
|\ | |||||
| * | * Better debug message on login problems. | Diva Canto | 2010-03-02 | 4 | -47/+94 |
| | | | | | | | | * Moved GridInfoService config to OpenSim.Server.ini | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 502 | -46871/+26028 |
|\ \ | |/ | | | | | This brings careminster on the level of master. To be tested | ||||
| * | Fixes Region.Framework tests. Although these tests don't fail, they need to ↵ | Diva Canto | 2010-03-02 | 2 | -16/+17 |
| | | | | | | | | be rewritten, because they are doing agent manipulations in the wrong way, so they're fairly meaningless. | ||||
| * | Fixed SQL tests. | Diva Canto | 2010-03-02 | 1 | -4/+1 |
| | | |||||
| * | Merge branch 'presence-refactor' | Melanie | 2010-03-02 | 1 | -8/+41 |
| |\ | |||||
| | * | Merge branch 'presence-refactor' of ↵ | Diva Canto | 2010-03-01 | 4 | -38/+52 |
| | |\ | | | | | | | | | | | | | ssh://diva@opensimulator.org/var/git/opensim into presence-refactor | ||||
| | * | | Offline friendship offers now working. | Diva Canto | 2010-03-01 | 1 | -8/+41 |
| | | | | |||||
| * | | | Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-02 | 0 | -0/+0 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'master' into presence-refactor | Melanie | 2010-03-02 | 4 | -38/+52 |
| | |\ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into presence-refactor | Melanie | 2010-03-02 | 4 | -38/+52 |
| |\ \ \ | | |/ / | |/| / | | |/ | | | | This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor branch remains for experimental work. | ||||
| | * | Fix a few compiler warnings. | Jeff Ames | 2010-03-01 | 3 | -9/+0 |
| | | | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-03-01 | 1 | -33/+18 |
| | | | |||||
| * | | Changed the query in GetFriends in SQLite to match the one in MySql. | Diva Canto | 2010-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Friends rights under control. | Diva Canto | 2010-03-01 | 4 | -72/+41 |
| | | | |||||
| * | | More work on GrantRights. Still not right. | Diva Canto | 2010-03-01 | 3 | -78/+135 |
| | | | |||||
| * | | Fix -1 checks for login case | Melanie | 2010-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Small tweak | Melanie | 2010-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-03-01 | 8 | -804/+951 |
| |\ \ | | |/ | |||||
| | * | fix bug where region settings loaded via an oar (water height, terrain ↵ | Justin Clark-Casey (justincc) | 2010-02-26 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | textures, etc.) were not being persisted to the database this meant that the loaded settings would disappear after a restart | ||||
| | * | minor formatting tweak - try to trigger a build on panda | dahlia | 2010-02-22 | 1 | -1/+0 |
| | | | |||||
| | * | add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive | dahlia | 2010-02-22 | 1 | -0/+35 |
| | | | |||||
| | * | Minor formatting cleanup. | Jeff Ames | 2010-02-22 | 2 | -36/+35 |
| | | | |||||
| | * | Separate PhysX classes into separate files. | Jeff Ames | 2010-02-22 | 4 | -770/+882 |
| | | | |||||
| * | | Should have things the right way around, better that way | Melanie | 2010-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Change friends to handle offers as it was originally designed. This may | Melanie | 2010-03-01 | 4 | -21/+5 |
| | | | | | | | | | | | | need to be changed in SQLite & MSSQL as well | ||||
| * | | Merge branch 'presence-refactor' of ↵ | Melanie | 2010-02-28 | 7 | -1/+186 |
| |\ \ | | | | | | | | | | | | | melanie@opensimulator.org:/var/git/opensim into presence-refactor | ||||
| | * | | Added FriendsData to both Null storage and SQLite. Untested. | Diva Canto | 2010-02-28 | 7 | -1/+186 |
| | | | | |||||
| * | | | Implement rights changes locall (UNTESTED) | Melanie | 2010-02-28 | 1 | -10/+38 |
| |/ / | |||||
| * | | Change the signature of SendChangeUserRights, because we have to send | Melanie | 2010-02-28 | 9 | -10/+10 |
| | | | | | | | | | | | | this to both parties | ||||
| * | | Add missing ChangeUserRights packet sender | Melanie | 2010-02-28 | 9 | -0/+44 |
| | | | |||||
| * | | Initial Online friends notification seems to be working reliably now. All ↵ | Diva Canto | 2010-02-28 | 14 | -36/+94 |
| | | | | | | | | | | | | this needs more testing, but everything is there. | ||||
| * | | Friends connectors finished. Status notification working across the board. ↵ | Diva Canto | 2010-02-28 | 3 | -67/+385 |
| | | | | | | | | | | | | One last bug: friends online upon login are not being sent to the user. | ||||
| * | | Status notification (online/offline) working for same sim. | Diva Canto | 2010-02-27 | 2 | -18/+71 |
| | | | |||||
| * | | Update the local cache upon friendship acceptance. Logout notifications working. | Diva Canto | 2010-02-27 | 1 | -0/+4 |
| | | | |||||
| * | | * Finished implementation of FriendsService.Delete | Diva Canto | 2010-02-27 | 2 | -2/+5 |
| | | | | | | | | | | | | * Deny now working | ||||
| * | | Friends online notifications upon friendship now working (same sim only). | Diva Canto | 2010-02-27 | 2 | -2/+17 |
| | | | |||||
| * | | Implement the requestonlinenotification method | Melanie | 2010-02-27 | 1 | -0/+23 |
| | | | |||||
| * | | Move requestonlinenotification generic message to presence module | Melanie | 2010-02-27 | 2 | -6/+30 |
| | | | |||||
| * | | Implement a handler for requestonlinenotification generic message | Melanie | 2010-02-27 | 1 | -0/+6 |
| | | | |||||
| * | | Friendships established. | Diva Canto | 2010-02-27 | 1 | -0/+7 |
| | | | |||||
| * | | * Friendship offers starting to work in the same sim. Not quite right yet. | Diva Canto | 2010-02-26 | 3 | -102/+309 |
| | | | | | | | | | | | | | | | * Added skeleton for out Connectors/Friends/FriendsSimConnector.cs * Moved request handler to its own file | ||||
| * | | More flesh to FriendsModule. Still incomplete. | Diva Canto | 2010-02-26 | 1 | -0/+67 |
| | | | |||||
| * | | Add the client message handlers. The calling card handlers that are part of | Melanie | 2010-02-26 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | the old friends module are omitted intentionally, as I believe those should be in a calling card module, not bundled with friends. | ||||
| * | | Removed unnecessary debug message | Diva Canto | 2010-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | Now showing friends online upon grid login. | Diva Canto | 2010-02-26 | 5 | -6/+17 |
| | | | |||||
| * | | Flags on Store(Friend) are supposed to be MyFlags. | Diva Canto | 2010-02-26 | 2 | -2/+2 |
| | | | |||||
| * | | * Friends out connector completed. Grid login retrieves friends correctly. | Diva Canto | 2010-02-26 | 6 | -4/+260 |
| | | | | | | | | | | | | * Added friends configs to grid .inis | ||||
| * | | Added server-side Friends in connector. Untested. | Diva Canto | 2010-02-25 | 7 | -0/+335 |
| | | | |||||
| * | | Merge branch 'presence-refactor' of ↵ | Melanie | 2010-02-25 | 6 | -22/+44 |
| |\ \ | | | | | | | | | | | | | melanie@opensimulator.org:/var/git/opensim into presence-refactor |