aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-181-2/+6
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Propagate our teleport flags on loginsBlueWall2012-02-181-2/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-01-271-6/+7
|\ \ | |/
| * HG Inventoty: Guard against items not found.Diva Canto2012-01-261-6/+7
| |
* | Merge branch 'master' into careminsterMelanie2012-01-122-7/+13
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-122-7/+13
| | | | | | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+25
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profile UpdatesBlueWall2012-01-031-0/+25
| | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG: Verify that the user is localDiva Canto2011-12-211-0/+8
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-052-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG: Renamed one methodDiva Canto2011-12-042-2/+2
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-171-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-151-11/+10
| | | | | | | | constructed it
* | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Guard HGAssetService against uninitialized variables and null arguments.Diva Canto2011-10-151-0/+3
| |
* | Resolve merge commits, stage 1Tom2011-09-041-10/+7
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-171-1/+1
| |
| * Do proper locking of m_localScenes list in SceneManagerJustin Clark-Casey (justincc)2011-08-061-4/+3
| |
| * refactor: Move all callers of the obsoleted ↵Justin Clark-Casey (justincc)2011-07-131-5/+3
| | | | | | | | SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest()
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-2/+4
|\ \ | |/
| * Removing special casing on failures. This may also fix reports of this issue:Diva Canto2011-06-081-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-refactorMelanie2011-06-093-6/+597
|\ \ | |/
| * Deleted wrong debug message.Diva Canto2011-06-081-1/+0
| |
| * Added error message to help understand ↵Diva Canto2011-06-071-0/+5
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5527
| * This hopefully fixes all issues with online/offline notifications across ↵Diva Canto2011-06-071-7/+21
| | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528
| * Remove scary error messageDiva Canto2011-06-071-6/+0
| |
| * This fixes the crash reported in ↵Diva Canto2011-06-072-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 Canto2011-06-061-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 Canto2011-06-021-13/+13
| |
| * Re-Apply Use current TravelingAgent if the the login failure reason is ↵BlueWall2011-06-011-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 ↵BlueWall2011-06-011-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" ↵BlueWall2011-06-011-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 Canto2011-05-271-0/+2
| |
| * Commented a few extra debug messages.Diva Canto2011-05-261-5/+5
| |
| * HG IM in grid mode working fairly well. Unknown target user references ↵Diva Canto2011-05-262-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 Canto2011-05-252-0/+322
| | | | | | | | testing.
| * Added necessary code to drop inventory on hg friends using the profile ↵Diva Canto2011-05-241-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 Canto2011-05-231-3/+169
| | | | | | | | friends in other grids.
| * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-221-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 removedDiva Canto2011-05-221-11/+0
| |
| * Fixed permissions bug related to friends in PermissionsModule. Added ↵Diva Canto2011-05-211-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 Canto2011-05-191-0/+95
| | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-2/+37
|\ \ | |/
| * Thank you Snoopy for a patch that adds some filtering to client versions ↵Diva Canto2011-04-271-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-refactorMelanie2011-03-101-1/+1
|\ \ | |/
| * Normalizing comparison to lower case, just in case ppl set their config vars ↵Diva Canto2011-03-011-1/+1
| | | | | | | | inconsistently. (maybe related to mantis #5386)
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-182-4/+5
|\ \ | |/
| * Put the 'new' back to avoid a warning. Yes, we want to hide it.Diva Canto2011-01-171-1/+1
| |
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2011-01-183-5/+6
| |
generated by cgit v1.1 at 2024-12-23 00:28:04 +0000