ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-24 15:25:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,371 Commits 5 Branches 106 Tags
bdd7ea06ff5ce20cb63594556dfd925c96fa847d
Commit Graph

1578 Commits

Author SHA1 Message Date
UbitUmarov
6bc479fecd make bakes reception handle empty BakedTexture elements. But at same time stop sending them, only sending to Xbakes server items that do have a texture, like master does 2015-10-01 19:30:37 +01:00
UbitUmarov
55d0425dfe add missing handlers for preferences 2015-09-28 12:47:29 +01:00
UbitUmarov
ae195632e9 add the Default Groups module lost in the merge 2015-09-26 18:18:29 +01:00
UbitUmarov
2f1eab2792 remove bad merge from master 2015-09-16 16:34:16 +01:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
 2015-09-08 04:54:16 -07:00
Diva Canto
d00f73c3a4 Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework. 2015-09-04 14:39:23 -07: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
UbitUmarov
0b105da626 Merge branch 'mbworkvar2' into ubitvar 2015-08-19 08:48:50 +01:00
Diva Canto
0cdd1165c8 Minor improvement of previous patch. 2015-08-16 21:23:41 -07:00
Cinder
fc6fe75268 MANTIS-7684 - Use the user management module to get username for script dialogs 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-08-16 21:13:42 -07:00
Drake Arconis
a5967d918a Send a proper ownerid for Object messages to conform with what viewer expects 
Signed-off-by: Melanie Thielker <melanie@t-data.com>
 2015-08-15 01:18:20 +02:00
Diva Canto
959872315f WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum. 
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
 2015-08-08 12:12:50 -07: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
Diva Canto
96f0c6f074 More on mantis #7567. Two things: 
- Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing
- Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time
 2015-06-05 10:07:50 -07:00
AliciaRaven
5e09e52ee9 Attachments Module. Fix detach event not being fired until the next time the object is attached. 
Not an ideal fix but this allows scripts such as AOs to remove animations when detached etc. The pause added does not affect other avatars or the scene in general and only pauses the avatar performing the detach for an extra 2 milliseconds.

Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-05-26 15:05:32 -07: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
Melanie Thielker
a2676388f4 Make the scripted dialogs and restart message appear in the top right corner 
again. Viewers have been busy making these notifications all into toasts but
we believe there are message that are important enough to make the user
acknowledge them.
 2015-03-23 22:17:51 +01:00
Justin Clark-Casey (justincc)
b267c238fb minor: Remove windows build warning about CompressionLevel package ambiguity. 
Relates to http://opensimulator.org/mantis/view.php?id=7442
Thanks Fly-Man-
 2015-03-11 22:53:32 +00:00
Justin Clark-Casey (justincc)
b1b72d7c2f Reduce coupling in regression test task inventory creation methods to make them usable in tests with no scene present 2015-02-25 20:30:03 +00:00
BlueWall
023fd71ce5 Fix cross-grid inventory delivery notifications, fixes http://opensimulator.org/mantis/view.php?id=7113 2015-02-21 14:29:31 -05: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)
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
Diva Canto
20b34135cb Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2015-01-09 08:32:40 -08:00
Diva Canto
e2dd15625f Added GetDisplayNames capability. For now, we don't actually use display names, and this cap returns the regular name. But this moves the server side into the newer, preferred, protocol used by the viewer for fetching the names of agents in the scene given their UUIDs. (the old protocol is via UDP). This works fine in my limited tests, but could use further testing by others. 2015-01-09 08:31:56 -08:00
Justin Clark-Casey (justincc)
08606ae409 Make the IteratingUuidGatherer the only UuidGatherer. 
This UUID gatherer provides a superset of the previous gatherer's functionality
as it also allows the caller to control gathering iterations for load purposes.
 2015-01-08 20:21:40 +00:00
Justin Clark-Casey (justincc)
9cff0bbd7c In XBakesModule.Get() use using() to always dispose of RestClient which disposes the stream rather than disposing the stream directly 2014-12-20 01:46:32 +00:00
Justin Clark-Casey (justincc)
798074c66f Use using() semantics in XBakesModule to ensure disposable objects are alway disposed no matter what 2014-12-20 01:38:48 +00:00
Justin Clark-Casey (justincc)
e901253b49 Fix recent regression where a race condition meant SP.MakeRootAgent() would sometimes look to start attachment scripts before ETM.HandleIncomingSceneObject() had added them. 
Probably a regression since ghosts branch merge on Nov 26 2014
 2014-12-17 00:25:24 +00:00
Justin Clark-Casey (justincc)
2b9f0647de Fix a regression where objects crossing regions in the same simulator (on their own or as attachments) with AppDomainLoading = false would create the new state in the source region area rather than the dest. 
This was beause the code was finding the script DLL compiled for the source region as everything is in the same appdomain and using this as the location for the destination script state, etc.
This resolves the regression by passing the proper destination separately from the DLL retrieved.
Probably a regression since commit d7b92604 (11 July 2014).
Added regression test for this case.
At least partly addresses http://opensimulator.org/mantis/view.php?id=7278
 2014-12-10 00:25:27 +00:00
Justin Clark-Casey (justincc)
86367d7219 refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class. 
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
 2014-11-25 23:56: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
Justin Clark-Casey (justincc)
fc878a33ed refactor: consistently put all test classes in the OpenSim.Tests.Common package rather than some in OpenSim.Tests.Common.Mock 
the separate mock package was not useful and was just another using line to always add
 2014-11-25 23:21:37 +00:00
Melanie Thielker
80118ac057 Remove braindead "fix" that messed up intersim scripted giving. 2014-11-21 04:00:52 +01:00
Melanie Thielker
bec456c2a5 Remove the Invisible stuff and add more baked caching. Refactor selection of textures to save to Bakes module. 2014-11-11 07:09:30 +01:00
Justin Clark-Casey
4123b0fdbd minor: correct console response when setting attachments logging level 2014-11-10 23:48:59 +00:00
Melanie Thielker
36ecad98a1 Only send the actual bakes to the bakes module 2014-11-10 04:48:19 +01:00
UbitUmarov
d0dfa721f2 change last commit, need to send to Xbakes or changes will not be detected 2014-10-29 06:56:54 +00:00
UbitUmarov
7723b1bcd3 bug fix and don't send to xbakes if requesting rebakes 2014-10-29 06:55:04 +00:00
UbitUmarov
afa2466951 Fix baked textures for regions without external Xbakes adding rebake 
requests. Those may also be trigger if for same reason one is missing even
with Xbakes. Later we can let this regions send the assets on teleports,
changing how those are serialized
 2014-10-29 06:35:23 +00:00
BlueWall
b463870914 Add hypergrid teleporting support to user profiles picks 2014-10-27 17:27:42 -04:00
UbitUmarov
c46c3a27ae do consider skirt baked texture on validation 2014-10-26 18:53:11 +00:00
UbitUmarov
736490dcb6 dont send baked textures assets, but send cache information 2014-10-26 18:13:44 +00:00
Justin Clark-Casey (justincc)
2a9528fa22 Don't unnecessarily remove from backup objects that were not directly attached from the scene. 
These are never in region backup in the first place since recent 11830c43
Extend regression test to check backup status.
 2014-10-02 22:30:44 +01:00
Diva Canto
763c22b28e Improve on the last commit to InventoryArchiver: put back the original constructor (3rd party modules use it), change order of new parameters to make it more consistent. 2014-09-28 16:10:32 -07:00
AliciaRaven
1e22091193 Modifications to previous IAR commits to bring them more inline with existing OpenSim code conventions. Also include new IAR save switch in console help print out. 2014-09-23 00:04:59 +01:00
AliciaRaven
5bc3bbbcf3 Add an event callback for loading IAR files. The callback for creating them already existed but not for loading. This is of interest for use by region modules. Also includes reporting numbers of items saved and items filtered to the completed log printout. 2014-09-23 00:04:53 +01:00