ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-20 07:05:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,256 Commits 5 Branches 93 Tags
b8d97ff37d0ad18ea288b6f68ef309b841ef4ced
Commit Graph

52 Commits

Author SHA1 Message Date
Melanie Thielker
0517e3d439 Mantis #8000, don't charge for updating classifieds. Thanks, Cinder! 
Signed-off-by: Melanie Thielker <melanie@t-data.com>
 2016-08-20 22:44:32 +01:00
UbitUmarov
55d0425dfe add missing handlers for preferences 2015-09-28 12:47:29 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Oren Hurvitz
8aa75f225b Fixed bug introduced in 4735514. The project didn't compile. 2015-07-26 14:09:17 +03:00
Quill Littlefeather
4735514a88 Fixed not being charged to create classifeids on money enabled regions 
Signed-off-by: Melanie Thielker <melanie@t-data.com>
 2015-07-26 02:31:31 +02:00
AliciaRaven
1e444b1449 Change UserProfiles so that the parcel name is used for a ProfilePick and 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>
 2015-04-12 15:36:22 -04:00
Robert Adams
07dead7dcb varregion: any conversions of use of Constants.RegionSize converted into 
Util.cs routines to convert region coords to and from world coords or handles.
 2015-03-29 14:25:12 -07:00
Justin Clark-Casey (justincc)
97ac80d664 minor: Suppress the log messages when user profiles data is requested for an 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
 2015-01-16 00:54:32 +00:00
Justin Clark-Casey (justincc)
ec8d21c434 Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis. 
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
 2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
8c9f82b035 Just for now, don't alert the user or log if we couldn't change their 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.
 2014-11-25 23:23:10 +00:00
BlueWall
b463870914 Add hypergrid teleporting support to user profiles picks 2014-10-27 17:27:42 -04:00
UbitUmarov
ce8ea55f4e ... and a few more.. 2014-09-17 17:25:07 +01:00
Diva Canto
733763c4e2 Amend to previous commit -- write down the problematic Profile server URL. 2014-06-05 20:06:01 -07:00
Diva Canto
5bb95a8a55 May fix mantis #7133 2014-06-05 18:59:30 -07:00
Oren Hurvitz
882af7195c Better error-handling and logging in case User Profile requests fail 2014-05-19 11:11:06 +01:00
Oren Hurvitz
e8a2eff2e8 Changed how UserProfile performs a fallback call using the OpenProfile API, because now JsonRpcRequest() returns an error result instead of throwing an exception 2014-04-24 15:58:43 +01:00
Oren Hurvitz
d62f0bc35d Refactored: moved OpenProfileClient to a location where it can be used by both the Simulators and Robust 2014-04-24 15:58:42 +01:00
BlueWall
63fd027494 Catch empty url error 2014-04-19 22:25:21 -04:00
BlueWall
14836e60ff Fix issue with user picks creation. The snapshot id is UUID.Zero in new parcels. 2014-03-25 11:10:48 -04:00
BlueWall
542bef20e8 Move JsonRpc request code out for general availability 2014-03-25 11:08:27 -04:00
Oren Hurvitz
368b29a680 In Core Profiles: as a fallback, try to get profiles from foreign grids using the OpenProfile protocol 
Resolves http://opensimulator.org/mantis/view.php?id=6954
 2014-03-25 09:37:18 +01:00
Justin Clark-Casey (justincc)
14569992e1 Prevent adding a land object if it overlaps any existing objects that have 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.
 2014-03-06 00:11:13 +00:00
Justin Clark-Casey (justincc)
ffd0da23fb Merge branch 'justincc-master' 2014-02-14 00:16:17 +00:00
Justin Clark-Casey (justincc)
f49d513089 Change warns associated with UserAgentServiceConnector to debugs, as this is 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
 2014-02-14 00:08:13 +00:00
Justin Clark-Casey (justincc)
fc35b45e21 If calls to UserAgentServiceConnector fail then throw an exception. This 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.
 2014-02-14 00:01:12 +00:00
Justin Clark-Casey (justincc)
b2878eb773 Merge branch 'justincc-master' 2014-01-31 00:51:22 +00:00
Oren Hurvitz
b8e22f02e7 Make sure Web streams are disposed after use 2014-01-31 00:44:22 +00:00
Melanie
e79fab91db Intermediate commit. Sill errors. 
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
 2014-01-05 20:12:32 +00:00
Robert Adams
6937eec258 Merge branch 'master' into varregion 
Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-17 06:18:13 -08:00
BlueWall
141d771a93 Fix issue with editing notes for other avatars 2013-12-16 17:36:21 -05:00
Robert Adams
13a9a4b653 varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. 
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.
 2013-12-14 07:53:01 -08:00
Melanie
958a8f274b Revert "Add support for user preferences (im via email)" 
This reverts commit 1842388bb4.
 2013-12-07 01:29:15 +00:00
BlueWall
1842388bb4 Add support for user preferences (im via email) 2013-12-06 02:52:13 -05:00
Robert Adams
25ae59b9eb varregion: remove scattered use of Constants.RegionSize by having routines reference RegionInfo.RegionWorldLoc?. 2013-10-07 13:57:30 -07:00
Robert Adams
317c04fe17 VarRegion: change RegionInfo storage of region coordinates from region 
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.
 2013-09-28 07:33:52 -07:00
BlueWall
9643915093 Remove test that gives issue on Windows, just let the try/catch do the work. 2013-09-02 16:28:40 -04:00
BlueWall
56f565b601 Profiles: Clean up some log entries caused when visiting HG avatar is using legacy profiles 2013-08-29 16:54:13 -04:00
Justin Clark-Casey (justincc)
85a9cb260a Remove mono compiler warnings from UserProfilesModule 2013-08-17 01:10:58 +01:00
Diva Canto
c4f1ec1fd6 Changed the UserProfileModule so that it's less greedy in terms of thread usage. 2013-07-11 10:21:20 -07:00
Robert Adams
bb6fb65392 Revert "minor: remove some mono compiler warnings in UserProfileModule" 
Revert until we understand why all the calls to GetUserProfileServerURI were also
commented out.

This reverts commit 5f58b9b552.
 2013-07-09 18:24:39 -07:00
Justin Clark-Casey (justincc)
5f58b9b552 minor: remove some mono compiler warnings in UserProfileModule 2013-07-09 00:04:46 +01:00
Justin Clark-Casey (justincc)
e6cb7b4764 Lock m_classifiedCache and m_classifiedInterest dictionary reads in 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
 2013-06-15 00:52:57 +01:00
Justin Clark-Casey (justincc)
42b0c68eab Correct build break in previous commit 9c530d7 2013-06-15 00:46:55 +01:00
Justin Clark-Casey (justincc)
9c530d725f refactor: In UserProfileModule, change classifiedCache and classifiedInterest to m_classifiedCache and m_classifiedInterest 
This is the coding standard name style for private fields.
 2013-06-15 00:41:02 +01:00
BlueWall
75e4af9d39 Catch exception triggered by incoming avatars using legacy profiles 2013-06-08 11:00:05 -04:00
BlueWall
1cb1245d84 SQLite support for UserProfiles 2013-06-07 20:14:39 -04:00
BlueWall
e449950030 Prevent processing for Npc 2013-06-05 18:42:15 -04:00
BlueWall
10572b78f8 Remove a couple of orphaned lines 2013-06-05 15:10:53 -04:00
BlueWall
b4f472c4fa Make locking more uniform 2013-06-05 15:08:25 -04:00