Diva Canto
7d6adeedf5
Fixed a merge issue
2016-06-06 08:41:08 -07:00
Diva Canto
c4c3163db9
Don't copy assets to foreign asset servers when the objects are being deleted
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
2016-06-06 08:37:15 -07:00
Diva Canto
057d1b2a6e
Minor improvement over the previous commit -- make sure the code exists in the FolderType enum
2016-05-16 21:57:19 -07:00
Diva Canto
9e21647011
Mantis #7878 -- Landmarks were not being created in HGSuitcaseInventory
2016-05-16 19:36:20 -07:00
Melanie Thielker
59ed89769a
Apply user specified default perms across the board, to items uploaded as well as items created and to rezzed prims in world.
...
This effectively removes the concept of "default permissions" from OpenSim
because all known modern viewers set the permissions flags on login.
Ancient abandoned viewers will now default to the SL defaults.
2016-04-29 22:36:56 +02:00
Melanie Thielker
d42de53dda
Allow default permissions from the viewer to be applied to uploaded objects.
...
Make inventory items reflect coorect permissions immediately unstead of after relog
2016-04-29 21:23:32 +02:00
UbitUmarov
109723dc2d
add option MaxRegionsViewDistance to control the maximum range to tell viewer to connect to Neighbour regions, since that is diferent from view range
2016-01-26 20:39:37 +00:00
UbitUmarov
d5e21a0ad2
remove failed CreateAgent from agent child regions list
2015-12-02 04:40:06 +00:00
UbitUmarov
f1bbc4d386
stop some requests processing when module as no scenes (there must be a better way to fix this)
2015-11-27 14:39:11 +00:00
UbitUmarov
172bb05ec2
suspend the use of DisableSimulator, that is causing teleport and crossing issues
2015-11-25 04:13:13 +00:00
UbitUmarov
f45905851a
at end of teleport disable the sending simulator, not destiny
2015-11-24 14:01:51 +00:00
UbitUmarov
c84334fc72
add a missing override
2015-11-21 19:53:14 +00:00
UbitUmarov
4a0531244a
change a log message from error to just Debug
2015-11-20 00:45:12 +00:00
UbitUmarov
36f7e96392
clean code a bit
2015-11-19 15:02:12 +00:00
UbitUmarov
2e43343ca9
ClearPartAttachmentData before adding object to scene, not after
2015-11-19 14:45:39 +00:00
UbitUmarov
d1737de8d2
work around some 'tests' errors: Coalesced objects handling has changed
2015-11-17 03:10:59 +00:00
Melanie Thielker
69585a4824
More plumbing of the EntityTransferContext (not yet complete)
2015-11-01 19:11:14 +01:00
UbitUmarov
24472c3b67
fix merge issues
2015-11-01 03:25:36 +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
ea56f4f27c
Introduce an EntityTransferContext carrying the version numbers to pass
...
to all interested functions. Should fix the varregion conditional.
Still a testing version, do NOT use in production!
2015-10-31 18:13:02 +01:00
UbitUmarov
ed909f56da
fix mantis 7734, Thanks Garmin for the report
2015-10-31 13:22:50 +00:00
Melanie Thielker
dc6d9eadf3
Testing stage of the new versioning system. Use at own risk. May not
...
work. Will eat your babies. Yada. Yada.
2015-10-31 00:01:35 +01:00
Diva Canto
7ab633461e
Fixed merge conflicts
...
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2015-10-18 16:24:33 -07:00
Diva Canto
70a46fe090
Clean up of simulation version, the number that rules the compatibility of teleports:
...
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
2015-10-18 16:06:31 -07:00
UbitUmarov
31873485d9
do not send DisableSimulator on teleport if agent is already returning
2015-10-02 02:42:25 +01:00
UbitUmarov
6ae7341e42
send DisableSimulator messages on closing childagents. Possible still not on at best timming, or on the right source files
2015-10-01 20:50:12 +01:00
UbitUmarov
07a8618c56
revert previus wrong commit
2015-09-25 21:43:51 +01:00
UbitUmarov
40ae9ec554
patch objects crossings for var regions, until region location is fully fixed
2015-09-25 18:38:52 +01:00
UbitUmarov
812e808cee
remove messages on agents cross fails that got merged
2015-09-17 08:18:35 +01:00
UbitUmarov
9ac01010f4
change point of evocation of AgentHasMovedAway for HG
2015-09-16 04:32:09 +01:00
UbitUmarov
2bd7bbd1cb
restore some avn code, fixing for var regions
2015-09-16 02:25:12 +01:00
UbitUmarov
5becc16acf
try to improve vehicles crossing with Xengine. Lag seems main issue now, but needs testing, specially the fail cases, that most likelly need more work
2015-09-14 16:40:01 +01:00
UbitUmarov
dfc142a50f
try to be more friendly to HG
2015-09-12 14:37:07 +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
UbitUmarov
c1a4786be0
still a missing stat ID
2015-09-06 01:01:31 +01:00
UbitUmarov
0ddcc55166
let extra stats travel side by side with viewers ones... try to fix damm array indexes all over the place
2015-09-06 00:32:20 +01:00
UbitUmarov
2130984bef
a few changes to stats. Array order coerent on users. give up on moses stats for now, since SimExtraStatsCollector cant reach SimStatsReport etc
2015-09-04 23:07:25 +01: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
Diva Canto
11194209df
First commit where physics work as region module.
...
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
2015-08-31 14:09:15 -07:00
Diva Canto
134d4300f0
All physics plugins are now region modules. Compiles but doesn't run.
2015-08-31 13:02:51 -07:00
Diva Canto
ce2c67876e
More namespace and dll name changes. Still no functional changes.
2015-08-30 21:05:36 -07:00
Diva Canto
2c0cad6dd3
Renamed the namespaces too
2015-08-30 20:29:31 -07:00
UbitUmarov
0edffae7e4
more on tps and crossings
2015-08-30 19:17:35 +01:00
UbitUmarov
bd11311845
improve object crossings
2015-08-29 09:18:34 +01:00
UbitUmarov
b114a04ed4
fix NeighborRegions code
2015-08-29 03:41:43 +01:00
UbitUmarov
ce883e9b43
add more of the v03 checks and homeURL. Sending side only for now
2015-08-26 05:29:08 +01:00
UbitUmarov
73124f22cc
change teleport version number to v0.3, without actually adding the checks
...
for 0.7 sims, etc that we don't have. Also still not using the homeURL
added in core.
2015-08-26 03:21:48 +01:00
Melanie Thielker
028506cf3c
Partial plumbing for the agent stateful module features negotiation
2015-08-20 00:18:45 +02:00
