ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-17 18:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,653 Commits 5 Branches 102 Tags
b453ef0fbd3cc54752e97df9738bbc4a8a7c19d4
Commit Graph

1601 Commits

Author SHA1 Message Date
UbitUmarov
6d5b405168 simplify DeliverChatToAvatars(..) ( hopefully not breaking it ) 2015-11-24 17:28:05 +00:00
UbitUmarov
a0c3297b37 again chat echos, check repeats uncondicionally 2015-11-24 15:12:39 +00:00
UbitUmarov
08d061d201 reset control even prior to use 2015-11-24 14:28:35 +00:00
UbitUmarov
7cf2d261b3 reduce 'echos' on several regions per instance (mantis 7754) 2015-11-24 12:51:58 +00:00
UbitUmarov
36426b0db2 remove some compile warnings increasing total number by 2 2015-11-21 00:49:43 +00:00
UbitUmarov
a4ed111de1 cleanup indentation 2015-11-18 17:45:56 +00:00
UbitUmarov
6dafce9a12 fix another variable number of wearable types issue 2015-11-18 17:35:26 +00:00
UbitUmarov
6c766f3ab4 remove unused parameter - missing file 2015-11-17 08:02:48 +00:00
UbitUmarov
f7f5aba597 remove unused parameter 2015-11-17 07:59:11 +00:00
UbitUmarov
cd29abf1ac work around some 'tests' errors: fix wrong parameters 2015-11-17 07:22:36 +00:00
UbitUmarov
81b7f5551c work around some 'tests' errors: sp attachments and appearance are not in sync 2015-11-17 06:52:03 +00:00
UbitUmarov
364082d0e8 work around some 'tests' errors: add a httpserver 2015-11-17 04:19:30 +00:00
UbitUmarov
8567ef3c40 work around some 'tests' errors: test for null cacheItems 2015-11-17 03:00:27 +00:00
UbitUmarov
e15ebc091f bug fix: improve chat to child avatars. Still not good because of low resolution of child position updates 2015-11-17 01:31:06 +00:00
UbitUmarov
d19e4f598f deatach from backup on attachment 2015-11-16 20:12:40 +00:00
UbitUmarov
527ea37540 change OfflineMessageModule from new avination code to original master, for compatibility with current web servers php scripts. This may change after current test phase 2015-11-06 05:18:54 +00:00
Melanie Thielker
69585a4824 More plumbing of the EntityTransferContext (not yet complete) 2015-11-01 19:11:14 +01:00
UbitUmarov
54e1d54fb5 fix more merge issues 2015-11-01 03:33:19 +00:00
UbitUmarov
72684592ba Merge branch 'master' into avinationmerge 
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
 2015-11-01 03:01:59 +00:00
Melanie Thielker
e8e0ba6d8f Remove testing cruft that is blocking the new protocols. Unit tests no 
longer test TP v1 now.
TP v1 will be removed within 6 months anyway.
 2015-10-31 17:22:27 +01:00
UbitUmarov
9232876421 let silly tests override version on local connections 2015-10-31 02:05:11 +00:00
UbitUmarov
1982d72320 Make changes to a friend rights reach him on another sim; find on map does show the region. Issues: precise location on region still not avaiable and object edit permitions on viewers edit are not being updated (but are enforced by region). friends information is updated, and warnings are displayed. Only did minor testing... 2015-10-26 22:42:48 +00:00
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
Melanie Thielker
e26d0ee40a Make sure the chat module doesn't deactivate just because the section 
heading is missing
 2015-09-09 05:40:39 +02: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