aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-031-1/+8
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Catch any exceptions exiting the top of the robust console, as we already do ↵Justin Clark-Casey (justincc)2011-11-021-1/+8
| | | | | | | | | | | | for the main simulator. This prevents issues such as transient mono console problems from crashing the server.
* | Merge branch 'master' into bigmergeMelanie2011-10-262-1/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-252-1/+3
| | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-252-3/+73
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-242-3/+73
| | | | | | | | | | These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default) These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
* | Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmergeMelanie2011-10-252-23/+46
|\ \ | |/
| * Add option to allow remote http calls to setpassword in the ↵Justin Clark-Casey (justincc)2011-10-192-23/+46
| | | | | | | | | | | | | | AuthenticationService. This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini Default is false as before.
* | Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmergeMelanie2011-10-251-11/+6
|\ \ | |/
| * Make ScopeID optional for http GetAccount and GetAccountsJustin Clark-Casey (justincc)2011-10-191-11/+6
| | | | | | | | If not specified then it assumes UUID.Zero. as occurs elsewhere in the codebase
* | Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmergeMelanie2011-10-251-0/+6
|\ \ | |/
| * Make PrincipalID a synonym for UserID in GetUserAccountJustin Clark-Casey (justincc)2011-10-191-0/+6
| |
* | Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmergeMelanie2011-10-251-3/+3
|\ \ | |/
| * Get new NewUser and SetUserAccount calls to accept PrincipalID instead of ↵Justin Clark-Casey (justincc)2011-10-191-3/+3
| | | | | | | | UserID for consistency with output
* | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmergeMelanie2011-10-251-3/+59
|\ \ | |/
| * Allow an http call to set account details if AllowSetAccount = true in ↵Justin Clark-Casey (justincc)2011-10-191-3/+59
| | | | | | | | | | | | [UserAccountService]. As before, default is false to not allow these calls.
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-252-4/+62
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the ↵Justin Clark-Casey (justincc)2011-10-182-4/+62
| | | | | | | | | | | | | | | | | | UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-251-13/+5
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-121-13/+5
| |
* | Resolve merge commits, stage 1Tom2011-09-041-1/+1
|\ \ | |/
| * Pass the first name and last name from the agent circuit data to the ↵Justin Clark-Casey (justincc)2011-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | authorization service rather than from the account. This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account. See http://opensimulator.org/mantis/view.php?id=5517, this code is somewhat adapted/cleaned up from Michelle's patch I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure. It's up to the auth service to decide which data it actually uses. Possibly we should be passing through other info such as agent circuit ip
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-202-2/+123
|\ \ | |/
| * V2 map now working in grids too. WARNING: A few visible configuration ↵Diva Canto2011-06-132-2/+123
| | | | | | | | variables added in order for this to work. See .ini.example changes
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-132-0/+167
|\ \ | |/
| * bit depth: 24!!! begeez! -- zoom levels work now.Diva Canto2011-06-121-1/+3
| |
| * A few bug fixes on map V2. Zoom level weirdness still there.Diva Canto2011-06-121-3/+2
| |
| * First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto2011-06-122-0/+166
| | | | | | | | some issues with the zoom level -- TBD.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-097-9/+926
|\ \ | |/
| * When a plugin fails to load because a DLL is missing, log which DLL it isOren Hurvitz2011-06-071-0/+7
| |
| * This hopefully fixes all issues with online/offline notifications across ↵Diva Canto2011-06-071-3/+13
| | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528
| * This fixes the crash reported in ↵Diva Canto2011-06-071-12/+12
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.
| * HG IM bug fix: grid_instant_message was being placed in the default port ↵Diva Canto2011-06-021-2/+1
| | | | | | | | instead of the specified one.
| * Extra debug messageDiva Canto2011-06-021-0/+1
| |
| * HG Friends bug fix: connector was shrinking principalID to UUID.Diva Canto2011-06-021-3/+16
| |
| * HG lures working! Friends can offer friends HG teleports via the profile. ↵Diva Canto2011-05-271-41/+4
| | | | | | | | WARNING: additional configuration for HG inis -- see *Common.ini.example
| * Avoid a scary warning message about null replies from the user agent service.Diva Canto2011-05-271-0/+4
| |
| * Commented a few extra debug messages.Diva Canto2011-05-261-4/+1
| |
| * HG IM in grid mode working fairly well. Unknown target user references ↵Diva Canto2011-05-262-7/+54
| | | | | | | | 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/+328
| | | | | | | | testing.
| * Added necessary code to drop inventory on hg friends using the profile ↵Diva Canto2011-05-241-1/+31
| | | | | | | | 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-232-1/+87
| | | | | | | | friends in other grids.
| * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-222-3/+63
| | | | | | | | 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.
| * Fixed permissions bug related to friends in PermissionsModule. Added ↵Diva Canto2011-05-212-38/+97
| | | | | | | | 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-194-4/+317
| | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-141-1/+2
|\ \ | |/
| * The get_grid_info REST call now encodes XML EntitiesSignpostMarv Martin2011-05-141-1/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-131-0/+2
|\ \ | |/
| * This makes compression of fatpacks actually work. Previously they always ↵Diva Canto2011-05-111-3/+2
| | | | | | | | failed. See comment in WebUtil.
| * Revert "Functional improvement: close the stream. Non-functional: add debug ↵Diva Canto2011-05-111-19/+2
| | | | | | | | | | | | messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs." This reverts commit 5548f837501184d68c352097ad1a1de566e18ca0.
generated by cgit v1.1 at 2024-12-28 22:14:51 +0000