Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 1 | -1/+2 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| * | Switched to using the other Util function with a default value. | Diva Canto | 2013-02-27 | 1 | -1/+2 |
| | | |||||
| * | Moved the HG default variables out of [Startup] and into their own section ↵ | Diva Canto | 2013-02-27 | 1 | -1/+1 |
| | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-23 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| * | Added new Util function for reading config vars that's more generic than the ↵ | Diva Canto | 2013-02-22 | 1 | -1/+1 |
| | | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup] | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -3/+8 |
|\ \ | |/ | |||||
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵ | Diva Canto | 2013-02-21 | 1 | -3/+8 |
| | | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Improve efficiency of friends notification by only make one PresenceService ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | call for all friends rather than one for each friend. However, large groups could still take a very long time since we still need to message each avatar on different simulators. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -3/+100 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | HG 2.0: User Agent Service now can also control where the local users can ↵ | Diva Canto | 2012-09-22 | 1 | -3/+100 |
| | | | | | | | | go. Domain-name and user-level based. \o/ | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 1 | -2/+12 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | User level based restrictions for HyperGrid teleports, asset uploads, group ↵ | Snoopy Pfeffer | 2012-03-27 | 1 | -2/+12 |
| | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 1 | -0/+2 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | HG Friends: reroute the status notifications to the HGFriends service, so ↵ | Diva Canto | 2012-03-21 | 1 | -0/+2 |
| | | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -0/+10 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| * | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵ | Diva Canto | 2012-03-17 | 1 | -0/+10 |
| | | | | | | | | direct user connections. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -0/+25 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * | Profile Updates | BlueWall | 2012-01-03 | 1 | -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 careminster | Melanie | 2011-12-22 | 1 | -0/+8 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | HG: Verify that the user is local | Diva Canto | 2011-12-21 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | HG: Renamed one method | Diva Canto | 2011-12-04 | 1 | -1/+1 |
| | | |||||
* | | 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 | 1 | -6/+246 |
|\ \ | |/ | |||||
| * | 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 | ||||
| * | This fixes the crash reported in ↵ | Diva Canto | 2011-06-07 | 1 | -1/+1 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully. | ||||
| * | 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 IM in grid mode working fairly well. Unknown target user references ↵ | Diva Canto | 2011-05-26 | 1 | -0/+24 |
| | | | | | | | | 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 | 1 | -0/+11 |
| | | | | | | | | 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. | ||||
* | | 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) | ||||
| * | Improved debug messages to track what is going on with the XFF header | Diva Canto | 2011-01-09 | 1 | -5/+7 |
|/ | |||||
* | Minor bug fixes. Hunting down mantis #5259 | Diva Canto | 2010-12-09 | 1 | -1/+1 |
| | |||||
* | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -2/+4 |
| | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
* | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 1 | -4/+3 |
| | |||||
* | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 1 | -3/+7 |
| | |||||
* | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -1/+5 |
|\ | |||||
| * | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -1/+5 |
| | | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
* | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -4/+4 |
|/ | |||||
* | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 1 | -1/+1 |
| | | | | flexible without changing current behavior | ||||
* | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 1 | -2/+3 |
| | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. | ||||
* | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -12/+32 |
| | | | | untested. Committing to move to my other computer. |