Diva Canto
edc155c636
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-01-22 10:45:46 -08:00
Diva Canto
185e7048c8
On the GridService, the central simulator features: ensure that the map tile url ends with '/' because the viewer is dumb and just appends to it.
2015-01-22 10:45:07 -08:00
Justin Clark-Casey (justincc)
2d574c3036
Stop currently unsettable display names from appearing when [ClientStack.LindenCaps] Cap_GetDisplayNames = "localhost" is set by never passing the username.
...
Unexpectedly, not setting user name achieves this whereas one might have expected it to be done by not setting display_name in the cap OSD.
Emulates LL behaviour when no display name is set.
Relates to http://opensimulator.org/mantis/view.php?id=7408
2015-01-21 22:26:35 +00:00
Justin Clark-Casey (justincc)
aef6fd6927
If the SnedInventoryAync() method receives an exception log this but make sure it does not terminate the process.
...
Relates to http://opensimulator.org/mantis/view.php?id=7421
2015-01-21 20:54:23 +00:00
Justin Clark-Casey (justincc)
ed8d0fbea4
Don't allow a failure in create a request in HeloService.Connector.Helo() to propogate up the stack.
...
Relates to http://opensimulator.org/mantis/view.php?id=7421
2015-01-21 20:46:29 +00:00
Justin Clark-Casey (justincc)
155da5aad2
Add debug ability to ignore reliably sent packets that are not acknowledged.
...
This is controlled via the console command "debug lludp client set process-unacked-sends true [<avatar-first-name> <avatar-last-name>]"
For debug purposes to see if this process for very bad connections is causing general outbound udp processing delays.
Relates to http://opensimulator.org/mantis/view.php?id=7393
2015-01-21 20:31:42 +00:00
AliciaRaven
abf1836b81
Fix OfflineIMEmail value overwriting every time its called. The request was receiving a blank user prefs object to populate but then was checking for an email address. When this failed the email address was pulled from the User Account service and the empty prefs now including the email was saved before being loaded again to be returned. This was overwriting all other settings in the prefs. This fix returns the existing prefs first before checking the email address is set, and only updates email if missing.
2015-01-21 00:57:06 +00:00
Justin Clark-Casey (justincc)
d9bfc710c0
Replace the tabs that have crept into isolated places in config and config example files with spaces
2015-01-21 00:54:13 +00:00
Justin Clark-Casey (justincc)
372a7bf78e
minor: Comment out log line for the SimulatorFeatures cap request for now to reduce log verbiage. Please revert if still required.
2015-01-21 00:34:51 +00:00
Justin Clark-Casey (justincc)
25dd30ddb6
minor: Fix some CR line endings in Scene.Inventory.cs
2015-01-21 00:33:54 +00:00
Justin Clark-Casey (justincc)
a846e63c70
If [Permissions] serverside_object_permissions = false or the undocumented propogate_permissions = false, don't propogate permissions of prim inventory items.
...
This was a regression from 13f31fd
(4 Nov 2013)
Relates to http://opensimulator.org/mantis/view.php?id=7399
2015-01-21 00:21:27 +00:00
Justin Clark-Casey (justincc)
ac93ba9f85
minor: correct SceneCommunicationService.LogHeader spelling
...
Relates to http://opensimulator.org/mantis/view.php?id=7337
2015-01-20 00:19:33 +00:00
Justin Clark-Casey (justincc)
4b8215c893
minor: comment out unusued logging objects in some pCampbot behaviour classes
2015-01-20 00:18:25 +00:00
Justin Clark-Casey (justincc)
24ef043395
Make failures in PollServiceHttpRequest.DoHTTPGruntWork() actually log the exception on error
2015-01-19 23:52:34 +00:00
Justin Clark-Casey (justincc)
1f04e1bc23
minor: In AttachmentsModule.UpdateKnownItem use the existing IInventoryAccessModule reference that other methods are already using rather than fetching its own copy.
2015-01-17 00:08:16 +00:00
Justin Clark-Casey (justincc)
2995868176
Make XEngine.SaveAllState() actually do this instead of script maintenance
2015-01-17 00:05:13 +00:00
Justin Clark-Casey (justincc)
0eb268e265
minor: remove old commented out objectRemoved bool in XEngine.OnRemoveScript()
2015-01-16 23:59:08 +00:00
Justin Clark-Casey (justincc)
58f7efc41a
Add clearqueue code adjustment that should have been in previous commit faaf47a
2015-01-16 23:57:51 +00:00
Justin Clark-Casey (justincc)
faaf47a86f
Prevent a race condition between the script engine backup thread and script removal by locking on the script's EventQueue and only proceeding if it's flagged as still running.
...
Relates to http://opensimulator.org/mantis/view.php?id=7407
2015-01-16 23:55:11 +00:00
Justin Clark-Casey (justincc)
8d724e90de
For scripts in attachments, don't save .state files apart from the initial one as these are ignored since .state is saved in the attachment's asset.
...
This eliminates pointless work and exceptions when an appdomain is unloaded whilst an attachment script state is persisted.
Adds test for this case.
Relates to http://opensimulator.org/mantis/view.php?id=7407
2015-01-16 22:46:48 +00: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)
b22c072c40
Fix a recent regression with HG asset posting to other grids where the assets were no longer being posted.
...
Addresses regression from 08606ae
(Thu Jan 8 2015)
2015-01-15 23:44:34 +00:00
Justin Clark-Casey (justincc)
beef41f24c
Stop simulators attempting to contact registered but offline regions (RegionFlags.Persistent but not RegioNFlags.RegionOnline) on startup and when an avatar completes a teleport.
...
This eliminates spurious network calls and failure reporting.
This is done by adding RegionFlags to the GridRegion returned data in a backward compatible way as an alternative to multiple IGridService.GetRegionFlags() calls
Using a simulator or a grid service older than this commit will just see previous behaviour.
2015-01-14 19:45:19 +00:00
Diva Canto
72814245be
Also deleted the option of setting Cap_WebFetchInventoryDescendents from OpenSim.ini.example
2015-01-14 06:33:15 -08:00
Diva Canto
8cc590cf80
And finally renamed the classes themselves.
2015-01-13 22:21:50 -08:00
Diva Canto
034fc325c0
Renamed the folder too.
2015-01-13 21:25:11 -08:00
Diva Canto
a626de696a
Renamed these 2 files, because their names are misleading. This is no longer called WebFetchInventoryDescendents, and we no longer use that cap; the viewers use FetchInvventoryDescendents2.
2015-01-13 21:24:01 -08:00
Justin Clark-Casey (justincc)
9363d4c784
Use ToString() on uuids returned in PGSQLUserProfilesData.GetUserImageAssets(). These are Guids rather than strings so casting to string generates a casting exception.
...
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-14 00:00:02 +00:00
Justin Clark-Casey (justincc)
02f2352ad5
Fix PGSQLUserProfilesData.GetUserPreferences error when no usersettings yet exist by inserting missing ID parameter.
...
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-13 23:52:52 +00:00
Justin Clark-Casey (justincc)
71d73777d9
Revert "Remove quotes from column selection in PGSQLUserProfilesData.UpdateAvatarProperties()"
...
This reverts commit fdecf4f610
.
2015-01-13 21:53:28 +00:00
Justin Clark-Casey (justincc)
8f37a61912
Revert "Remove quotes from column selection in PGSQLUserProfilesData.UpdateAvatarInterests()"
...
This reverts commit f31feef6c1
.
2015-01-13 21:53:18 +00:00
Justin Clark-Casey (justincc)
39989eda3b
Revert "Remove quotes from column selection in PGSQLUserProfilesData.GetUserImageAssets()"
...
This reverts commit bd9539c2a7
.
2015-01-13 21:53:04 +00:00
Justin Clark-Casey (justincc)
38f2b89248
Revert "Remove misstaken quotes from column selection in PGSQLUserProfilesData.GetUserAppData()"
...
This reverts commit 0794a40378
.
2015-01-13 21:52:43 +00:00
Justin Clark-Casey (justincc)
f9d2121bcf
Revert "Remove quotes from column selection in PGSQLUserProfilesData.SetUserAppData()"
...
This reverts commit 59c0df962a
.
This is necessary to preserve the casing of column names, otherwise pgsql converts everything to lowercase.
TIL, Unlike mysql, a quoted column still refers to the column itself...
2015-01-13 21:50:11 +00:00
Justin Clark-Casey (justincc)
24695dc05b
Fix PGSQLUserProfilesData.UpdateUserPreferences() imviaemail and visible casts. These should be left as bools, not converted to strings.
...
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-13 21:40:49 +00:00
Justin Clark-Casey (justincc)
46e8a99526
Change PGSQLUserProfilesData.UpdateUserPreferences() to directly pass the UUID to the uuid parameter instead of its ToString()
...
This may well be the cause behind "operator does not exist: uuid = character varying" pgsql errors.
If so, the other instances will also be changed.
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-13 21:13:57 +00:00
Justin Clark-Casey (justincc)
492d49eb08
Fix MySQL and PGSQL *UserProfilesData.GetUserAppData() calls to correctly set the UserId parameter instead of the non-existing Id parameter when writing a record because none yet exists.
...
SQLite version is already correct for this.
2015-01-13 20:33:36 +00:00
Justin Clark-Casey (justincc)
59c0df962a
Remove quotes from column selection in PGSQLUserProfilesData.SetUserAppData()
...
This may have been preventing it from working.
2015-01-13 20:27:37 +00:00
Justin Clark-Casey (justincc)
55ae9a7d10
Remove extraneous colon when setting TagId parameter in PGSQLUserProfilesData.GetUserAppData()
2015-01-13 20:15:37 +00:00
Justin Clark-Casey (justincc)
55e081548c
Fix bug where gathering the clientstack..OutgoingPacketsQueuedCount stat would fail with a casting exception for scenes with NPCs
...
Present since 51eb8fa
(Oct 2 2014)
2015-01-13 19:27:29 +00:00
Justin Clark-Casey (justincc)
0794a40378
Remove misstaken quotes from column selection in PGSQLUserProfilesData.GetUserAppData()
2015-01-13 19:20:27 +00:00
Justin Clark-Casey (justincc)
bd9539c2a7
Remove quotes from column selection in PGSQLUserProfilesData.GetUserImageAssets()
...
This may have been preventing it from working.
2015-01-13 18:57:32 +00:00
Justin Clark-Casey (justincc)
f31feef6c1
Remove quotes from column selection in PGSQLUserProfilesData.UpdateAvatarInterests()
...
This may have been preventing it from working.
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-13 18:54:41 +00:00
Justin Clark-Casey (justincc)
fdecf4f610
Remove quotes from column selection in PGSQLUserProfilesData.UpdateAvatarProperties()
...
This may have been preventing it from working.
2015-01-13 18:52:49 +00:00
Justin Clark-Casey (justincc)
0cc75a0a3c
Remove quotes from column selection in PGSQLUserProfilesData.GetAvatarNotes()
...
This may have been preventing it from working.
2015-01-13 18:50:34 +00:00
Justin Clark-Casey (justincc)
b38a552fd6
Remove quotes from field selection in PGSQLUserProfilesData.GetAvatarPicks()
...
This may have been preventing it from working.
2015-01-13 18:47:51 +00:00
Justin Clark-Casey (justincc)
43b094f549
minor: correct two exception messages in PGSQLUserProfilesData where I copy/pasted AgentInterestsUpdate twice
2015-01-13 18:42:04 +00:00
Justin Clark-Casey (justincc)
02dcfcf537
Remove the locking in PGSQLUserProfilesData which was buggy (Lock object wasn't set!) and is unnecessary.
...
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-12 23:39:27 +00:00
Justin Clark-Casey (justincc)
0c31eb0a5d
Add the missing deleted and re-added JobEngine class from the previous commit 8e1e8a0
2015-01-12 20:59:58 +00:00
Justin Clark-Casey (justincc)
8e1e8a0920
Make the performance controlling job processing threads introduced in conference code use a generic JobEngine class rather than 4 slightly different copy/pasted versions.
2015-01-12 20:56:37 +00:00