Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add missing handlers for preferences | UbitUmarov | 2015-09-28 | 1 | -0/+4 |
| | |||||
* | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 1 | -6/+1 |
| | |||||
* | bad merge? | UbitUmarov | 2015-09-01 | 1 | -4/+183 |
|\ | |||||
| * | varregion: any conversions of use of Constants.RegionSize converted into | Robert Adams | 2015-03-29 | 1 | -3/+3 |
| | | | | | | | | Util.cs routines to convert region coords to and from world coords or handles. | ||||
| * | ... and a few more.. | UbitUmarov | 2014-09-17 | 1 | -18/+31 |
| | | |||||
| * | Intermediate commit. Sill errors. | Melanie | 2014-01-05 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs | ||||
| * | | Revert "Add support for user preferences (im via email)" | Melanie | 2013-12-07 | 1 | -67/+0 |
| | | | | | | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b. | ||||
* | | | Fixed bug introduced in 4735514. The project didn't compile. | Oren Hurvitz | 2015-07-26 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed not being charged to create classifeids on money enabled regions | Quill Littlefeather | 2015-07-26 | 1 | -2/+14 |
| | | | | | | | | | | | | Signed-off-by: Melanie Thielker <melanie@t-data.com> | ||||
* | | | Change UserProfiles so that the parcel name is used for a ProfilePick and ↵ | AliciaRaven | 2015-04-12 | 1 | -17/+9 |
| | | | | | | | | | | | | | | | | | | not the parcel owners name. This change also fixes a bug where if the avatar enters and does not move, creating or editing a ProfilePick would set the parcelId as an empty UUID. This is because ScenePresence.currentParcelUUID is not set until the avatar moves. Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com> | ||||
* | | | minor: Suppress the log messages when user profiles data is requested for an ↵ | Justin Clark-Casey (justincc) | 2015-01-16 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | NPC or an HG user with no set server URI to avoid log spam. Messages concerning failure to contact a given user profiles service are preserved by logging within called code with the agent ID. If the "No Presence - foreign friend" log message is important then please revert. Relates to http://opensimulator.org/mantis/view.php?id=7414 | ||||
* | | | Label all threadpool calls being made in core OpenSimulator. This is to add ↵ | Justin Clark-Casey (justincc) | 2014-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | problem diagnosis. "show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats. | ||||
* | | | Just for now, don't alert the user or log if we couldn't change their ↵ | Justin Clark-Casey (justincc) | 2014-11-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | server-side preferences due to no e-mail address being sent. This is to avoid user confusion in the oscc rehearsal as they are often not aware that this fails because no e-mail is set. Also may be failing in the hypergrid case, though this may also be a config issue. This is meant as a temporary solution. | ||||
* | | | Add hypergrid teleporting support to user profiles picks | BlueWall | 2014-10-27 | 1 | -16/+97 |
| | | | |||||
* | | | Amend to previous commit -- write down the problematic Profile server URL. | Diva Canto | 2014-06-05 | 1 | -0/+3 |
| | | | |||||
* | | | May fix mantis #7133 | Diva Canto | 2014-06-05 | 1 | -7/+12 |
| | | | |||||
* | | | Better error-handling and logging in case User Profile requests fail | Oren Hurvitz | 2014-05-19 | 1 | -0/+9 |
| | | | |||||
* | | | Changed how UserProfile performs a fallback call using the OpenProfile API, ↵ | Oren Hurvitz | 2014-04-24 | 1 | -30/+37 |
| | | | | | | | | | | | | because now JsonRpcRequest() returns an error result instead of throwing an exception | ||||
* | | | Refactored: moved OpenProfileClient to a location where it can be used by ↵ | Oren Hurvitz | 2014-04-24 | 2 | -193/+1 |
| | | | | | | | | | | | | both the Simulators and Robust | ||||
* | | | Catch empty url error | BlueWall | 2014-04-19 | 1 | -0/+3 |
| | | | |||||
* | | | Fix issue with user picks creation. The snapshot id is UUID.Zero in new parcels. | BlueWall | 2014-03-25 | 1 | -6/+0 |
| | | | |||||
* | | | Move JsonRpc request code out for general availability | BlueWall | 2014-03-25 | 1 | -173/+19 |
| | | | |||||
* | | | In Core Profiles: as a fallback, try to get profiles from foreign grids ↵ | Oren Hurvitz | 2014-03-25 | 2 | -2/+219 |
| | | | | | | | | | | | | | | | | | | using the OpenProfile protocol Resolves http://opensimulator.org/mantis/view.php?id=6954 | ||||
* | | | Prevent adding a land object if it overlaps any existing objects that have ↵ | Justin Clark-Casey (justincc) | 2014-03-06 | 1 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | not had their bitmaps adjusted. This is to prevent an immediate problem in http://opensimulator.org/mantis/view.php?id=7035 where a development code bug occasionally overlays all the existing parcels with a blank parcel owned by the estate manager and to gather more data. My guess is that this parcel is being created by the new code in LandManagementModule.GetLandObject(), probably some race between threads since this only happens occasionally. Adds regression tests for this case and for parcel subdivide. | ||||
* | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-02-14 | 1 | -1/+10 |
|\ \ \ | |||||
| * | | | Change warns associated with UserAgentServiceConnector to debugs, as this is ↵ | Justin Clark-Casey (justincc) | 2014-02-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted). This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction | ||||
| * | | | If calls to UserAgentServiceConnector fail then throw an exception. This ↵ | Justin Clark-Casey (justincc) | 2014-02-14 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | lets the caller decide whether to discard the error or not. This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues. | ||||
* | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-31 | 1 | -42/+35 |
|\ \ \ \ | |/ / / | |||||
| * | | | Make sure Web streams are disposed after use | Oren Hurvitz | 2014-01-31 | 1 | -42/+35 |
| |/ / | |||||
* | | | Merge branch 'master' into varregion | Robert Adams | 2013-12-17 | 1 | -2/+69 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Add new region crossing code to varregion Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | Fix issue with editing notes for other avatars | BlueWall | 2013-12-16 | 1 | -2/+2 |
| |/ | |||||
| * | Add support for user preferences (im via email) | BlueWall | 2013-12-06 | 1 | -0/+67 |
| | | |||||
* | | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. | Robert Adams | 2013-12-14 | 1 | -2/+2 |
| | | | | | | | | | | | | Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module. | ||||
* | | varregion: remove scattered use of Constants.RegionSize by having routines ↵ | Robert Adams | 2013-10-07 | 1 | -2/+2 |
| | | | | | | | | reference RegionInfo.RegionWorldLoc?. | ||||
* | | VarRegion: change RegionInfo storage of region coordinates from region | Robert Adams | 2013-09-28 | 1 | -2/+2 |
|/ | | | | | | | | count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages. | ||||
* | Remove test that gives issue on Windows, just let the try/catch do the work. | BlueWall | 2013-09-02 | 1 | -5/+1 |
| | |||||
* | Profiles: Clean up some log entries caused when visiting HG avatar is using ↵ | BlueWall | 2013-08-29 | 1 | -16/+26 |
| | | | | legacy profiles | ||||
* | Remove mono compiler warnings from UserProfilesModule | Justin Clark-Casey (justincc) | 2013-08-17 | 1 | -19/+16 |
| | |||||
* | Changed the UserProfileModule so that it's less greedy in terms of thread usage. | Diva Canto | 2013-07-11 | 1 | -7/+5 |
| | |||||
* | Revert "minor: remove some mono compiler warnings in UserProfileModule" | Robert Adams | 2013-07-09 | 1 | -13/+16 |
| | | | | | | | Revert until we understand why all the calls to GetUserProfileServerURI were also commented out. This reverts commit 5f58b9b5526c401e039d27b8c92603ff02421fb8. | ||||
* | minor: remove some mono compiler warnings in UserProfileModule | Justin Clark-Casey (justincc) | 2013-07-09 | 1 | -16/+13 |
| | |||||
* | Lock m_classifiedCache and m_classifiedInterest dictionary reads in ↵ | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -14/+13 |
| | | | | | | UserProfileModule since in the presence of writes these are not thread-safe operations. Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together | ||||
* | Correct build break in previous commit 9c530d7 | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -10/+7 |
| | |||||
* | refactor: In UserProfileModule, change classifiedCache and ↵ | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -19/+23 |
| | | | | | | classifiedInterest to m_classifiedCache and m_classifiedInterest This is the coding standard name style for private fields. | ||||
* | Catch exception triggered by incoming avatars using legacy profiles | BlueWall | 2013-06-08 | 1 | -1/+10 |
| | |||||
* | SQLite support for UserProfiles | BlueWall | 2013-06-07 | 1 | -0/+1 |
| | |||||
* | Prevent processing for Npc | BlueWall | 2013-06-05 | 1 | -1/+3 |
| | |||||
* | Remove a couple of orphaned lines | BlueWall | 2013-06-05 | 1 | -3/+0 |
| | |||||
* | Make locking more uniform | BlueWall | 2013-06-05 | 1 | -14/+19 |
| | |||||
* | Adding back the BasicProfileModule | BlueWall | 2013-05-31 | 1 | -73/+15 |
| |