Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 2 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | HG: Renamed one method | Diva Canto | 2011-12-04 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -11/+10 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| * | Dont' bother with a userAgentService != null check right after we've ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -11/+10 |
| | | | | | | | | constructed it | ||||
* | | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Guard HGAssetService against uninitialized variables and null arguments. | Diva Canto | 2011-10-15 | 1 | -0/+3 |
| | | |||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -10/+7 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-17 | 1 | -1/+1 |
| | | |||||
| * | Do proper locking of m_localScenes list in SceneManager | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -4/+3 |
| | | |||||
| * | refactor: Move all callers of the obsoleted ↵ | Justin Clark-Casey (justincc) | 2011-07-13 | 1 | -5/+3 |
| | | | | | | | | SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest() | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Removing special casing on failures. This may also fix reports of this issue: | Diva Canto | 2011-06-08 | 1 | -2/+4 |
| | | | | | | | | 22:07:53 - [USER AGENT CONNECTOR]: remote call to http://hg.osgrid.org:80/ returned an error: Requested method [locate_user] from 127.0.0.1 threw exception: Object reference not set to an instance of an object at OpenSim.Services.HypergridService.UserAgentService.LocateUser (UUID userID) [0x00000] in <filename unknown>:0 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 3 | -6/+597 |
|\ \ | |/ | |||||
| * | Deleted wrong debug message. | Diva Canto | 2011-06-08 | 1 | -1/+0 |
| | | |||||
| * | Added error message to help understand ↵ | Diva Canto | 2011-06-07 | 1 | -0/+5 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5527 | ||||
| * | This hopefully fixes all issues with online/offline notifications across ↵ | Diva Canto | 2011-06-07 | 1 | -7/+21 |
| | | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528 | ||||
| * | Remove scary error message | Diva Canto | 2011-06-07 | 1 | -6/+0 |
| | | |||||
| * | This fixes the crash reported in ↵ | Diva Canto | 2011-06-07 | 2 | -17/+13 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully. | ||||
| * | This should make offline IMs work again. It should work for incoming foreign ↵ | Diva Canto | 2011-06-06 | 1 | -4/+47 |
| | | | | | | | | IMs where the local recipient is offline. I can't test any of this, because I don't run an offline IM server. | ||||
| * | Bug fix on HG IM. | Diva Canto | 2011-06-02 | 1 | -13/+13 |
| | | |||||
| * | Re-Apply Use current TravelingAgent if the the login failure reason is ↵ | BlueWall | 2011-06-01 | 1 | -2/+5 |
| | | | | | | | | | | | | "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady"" This reverts commit 0a430bbffb561a5172220e7617257798c11a66f5. | ||||
| * | Revert "Use current TravelingAgent if the login failure reason is "Logins ↵ | BlueWall | 2011-06-01 | 1 | -5/+2 |
| | | | | | | | | | | | | Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady" This reverts commit 4b9e446c6267a1161263d885699e72c97e8a94eb. | ||||
| * | Use current TravelingAgent if the login failure reason is "Logins Disabled" ↵ | BlueWall | 2011-06-01 | 1 | -2/+5 |
| | | | | | | | | to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady | ||||
| * | HG inventory transfers over the profile working. | Diva Canto | 2011-05-27 | 1 | -0/+2 |
| | | |||||
| * | Commented a few extra debug messages. | Diva Canto | 2011-05-26 | 1 | -5/+5 |
| | | |||||
| * | HG IM in grid mode working fairly well. Unknown target user references ↵ | Diva Canto | 2011-05-26 | 2 | -8/+38 |
| | | | | | | | | looked back in source user's User Agent service. | ||||
| * | HG: Instant Message working. Tested on HG standalones only. Needs a lot more ↵ | Diva Canto | 2011-05-25 | 2 | -0/+322 |
| | | | | | | | | testing. | ||||
| * | Added necessary code to drop inventory on hg friends using the profile ↵ | Diva Canto | 2011-05-24 | 1 | -0/+17 |
| | | | | | | | | window, but can't test because this mechanism doesn't seem to work without a profile service. | ||||
| * | HG friends: Status notifications working. Also initial logins get the online ↵ | Diva Canto | 2011-05-23 | 1 | -3/+169 |
| | | | | | | | | friends in other grids. | ||||
| * | More on HG Friends. Added Delete(string, string) across the board. Added ↵ | Diva Canto | 2011-05-22 | 1 | -86/+0 |
| | | | | | | | | 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. | ||||
| * | File to be removed | Diva Canto | 2011-05-22 | 1 | -11/+0 |
| | | |||||
| * | Fixed permissions bug related to friends in PermissionsModule. Added ↵ | Diva Canto | 2011-05-21 | 1 | -1/+3 |
| | | | | | | | | 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. | ||||
| * | HG Friends working to some extent: friendships offered and accepted ↵ | Diva Canto | 2011-05-19 | 1 | -0/+95 |
| | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -2/+37 |
|\ \ | |/ | |||||
| * | Thank you Snoopy for a patch that adds some filtering to client versions ↵ | Diva Canto | 2011-04-27 | 1 | -2/+37 |
| | | | | | | | | allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Normalizing comparison to lower case, just in case ppl set their config vars ↵ | Diva Canto | 2011-03-01 | 1 | -1/+1 |
| | | | | | | | | inconsistently. (maybe related to mantis #5386) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 2 | -4/+5 |
|\ \ | |/ | |||||
| * | Put the 'new' back to avoid a warning. Yes, we want to hide it. | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | |||||
| * | minor: resolve some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 3 | -5/+6 |
| | | |||||
| * | Revert "DEBUG DEBUG DEBUG" | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5. | ||||
| * | DEBUG DEBUG DEBUG | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | |||||
| * | Improved debug messages to track what is going on with the XFF header | Diva Canto | 2011-01-09 | 1 | -5/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 1 | -3/+5 |
|\ \ | |/ | |||||
| * | fixes a problem with ending slashes in GatekeeperService to verify ↵ | Myan Thor | 2010-12-29 | 1 | -3/+5 |
| | | | | | | | | session-addresses | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 1 | -16/+13 |
|\ \ | |/ | |||||
| * | Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. | Marck | 2010-12-13 | 1 | -16/+13 |
| | | | | | | | | | | | | Configuration option AssetService in section [GridService] must be set to enable this functionality. Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Minor bug fixes. Hunting down mantis #5259 | Diva Canto | 2010-12-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 2 | -10/+18 |
|\ \ | |/ |