a858804b42
fix a vector range parsing
2016-11-14 22:08:39 +00:00
d550b485f1
viewer crash bug fix: fis the udp packets split of SendEstateList() large lists; Enforce size limits on the estate lists since currently required for viewers compatibily; improve handling of changes with large selected items. This is still bad, users may need to close and reopen the region/estate information to get correct Allowed and Banned lists after a change. This happens because of viewer resent/outOfOrder packets that completly break this lists updates protocol
2016-10-24 10:23:31 +01:00
7494d7726a
change math on GetParcelMaxPrimCount and GetSimulatorMaxPrimCount to reduce round errors, limit both to region max prims. consider ObjectBonus on last one also. Change a variable name in PrimLimitsModule to make it more clear
2016-10-11 01:14:53 +01:00
76a2d90dad
remove attachment to event OnPreAgentUpdate that is doing nothing
2016-10-05 13:38:12 +01:00
58513fab8f
save oar: simplify confusing successefull assets saving message
2016-09-27 16:49:55 +01:00
f6e77e3935
load oar; activate area cliping if bounding-origin option is given. as help says
2016-09-27 15:24:05 +01:00
42989176ec
mute a debug message to mute jak daniels
2016-09-23 19:27:25 +01:00
d196958cc4
make sendRegionInfoPacketToAll really send to all ( inc child agents) thx Jak Daniels
2016-09-23 18:56:47 +01:00
f613b5f517
fix caching of wind and cloud packets in the case of several regions on a instance, that got broken with the necessary send to child agents.
2016-09-23 18:28:46 +01:00
22b531f2e4
make clouds a bit diferent on regions running on same instance.. well should be diferent .. :)
2016-09-23 17:13:59 +01:00
f5189b2cdd
do the same for legacy clouds (still visible on older viewer ie singu 1.8.7). Fix clouds update. Send clouds and wind also to child agents.
2016-09-23 16:04:43 +01:00
8d7f10e36b
cache wind compressed data so cpu burning compression is only done after a change. Not happy with version scheme for several regions on same instance, but should be ok for now
2016-09-23 13:55:23 +01:00
a6df626868
add a version tag to wind and cloud data updates to iclient
2016-09-23 13:03:16 +01:00
984cb38583
move wind generation out of heartbeat to a pool job. Use that to send to all clients and not one per client
2016-09-23 12:32:40 +01:00
d3627c4f33
no need to send wind on avatar arrival when it is sent periodicly
2016-09-22 19:25:04 +01:00
874ba6b363
avoid a null ref
2016-09-19 19:40:13 +01:00
592a915d8d
add rest of wiring for terrain bake persistent store (mantis 8024 but not
...
using its code). Only did minor testing in MySQL
2016-09-17 17:56:56 +01:00
7c4c3f0d10
Minor. Remove unused integer arrays from TerrainModule
2016-09-15 22:46:59 +01:00
b9380c033d
move region comands out of LocalGridServiceConnector where they do not belong
2016-09-10 12:43:48 +01:00
49c579ec71
suspend httpdos on mapimge, fix image not been updated after first Get till restart
2016-09-05 12:30:25 +01:00
0e68742afc
Fix some wrong handling of booleans for SeeAVs, AnyAVSounds and GroupAVSounds fields in sqlite3-database
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2016-09-05 08:39:16 +01:00
c05ee23d3d
minor change on warp3d lib
2016-08-24 04:10:35 +01:00
517064121d
estate handleTerrainRequest memory leaks
2016-08-24 01:22:50 +01:00
8eacc6b207
replace warp3D.dll by a newer modified version. (only minor testing done :(
2016-08-23 10:58:34 +01:00
08c1dff86c
change strange rotation in legacy MapImageModule (untested)
2016-08-22 20:43:47 +01:00
39e92adaf2
workaround potencial memory leak
2016-08-22 08:12:32 +01:00
4f4227d5bb
workaround potencial memory leak
2016-08-22 06:23:55 +01:00
c8a1d7e5a7
workaround potencial memory leaks
2016-08-22 03:55:01 +01:00
5d42d24428
limit the scan of terrain EnforceEstateLimits to the area changed.
2016-08-21 02:10:45 +01:00
73719b2efc
fix terrain BMP image format on SaveStream mantis: 8001
2016-08-21 00:25:32 +01:00
7d968213fd
fix region Allow damage and parcel safe flags handling
2016-08-17 23:33:11 +01:00
8fb7a3543f
let physics know about region water level change
2016-08-09 22:29:11 +01:00
83d6722d31
if a viewer overloads region capability to process RequestMapBlocks, ignore following requests for 300 seconds. This was necessary becaus some viewers like FireStorm are doing it, saturating region and grid services for no usefull reason
2016-08-06 22:12:38 +01:00
ec8101a24a
remove references to RegionCombinerModule
2016-07-28 00:34:16 +01:00
3f0d84c28b
cleanup some code
2016-07-25 19:49:40 +01:00
d6d3e14f29
add a missing update to avatar damage Invulnerable
2016-07-24 19:31:28 +01:00
4468aa0dcf
Merge branch 'master' of opensimulator.org:/var/git/opensim
2016-07-04 03:37:45 +01:00
ea8f3c83bf
Finally remove the requirement for an InventoryItem/FolderBase object to
...
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
2016-07-04 03:35:48 +01:00
58135ef52c
fix a lost region size of 256m
2016-07-03 19:39:13 +01:00
90b825cda8
if a NPC is owned, allow access if ownerID matchs parcel owner or it is in the access list. option OS_NPC_OBJECT_GROUP it still needed if access is by group (this option should also work with not owned NPC) NEEDS TESTING, may prove to be a bad solution
2016-06-28 23:30:04 +01:00
71404be21d
let llPlaySound() in HUDs send sound to owner without parcel restriction
2016-06-26 10:02:56 +01:00
8cb3787de8
mantis 7942: allow llTriggerSound on HUDs to send sounds to all.
2016-06-26 09:40:05 +01:00
359908fa88
Related to mantis #7929 : "For sale" was not being accepted, because of permissions fail. This adds a new permissions check CanSellGroupObject. THIRD-PARTY PERMISSIONS MODULES TAKE NOTE OF THIS NEW EVENT.
2016-06-20 10:08:15 -07:00
12b73603cc
Still related to mantis #7917 , parcel prims info. Now sending the correct numbers for "Simulator primitive usage" related to the parcel owner, not the entire region.
2016-06-19 09:17:04 -07:00
ce7fa728ef
Mantis #7917 : regression on prim limits module.
2016-06-18 22:07:01 -07:00
53d8b8a83f
Mantis #7874 : parcel properties not being updated upon avatar entering new parcel. Root cause: update of the avatar's current property was being made too soon.
2016-06-11 10:23:07 -07:00
1e44aba620
According to the SL wiki, estate managers can set parcels for sale. Make it sew.
2016-05-02 21:40:14 +02:00
a01f24e331
Replace the "land show" method with the better one from 0.8.
2016-04-28 16:13:23 +02:00
170acd7d67
change parcel_owner_is_god configuration option from default from true to false, leaving only region_owner true by default
2016-01-30 15:42:59 +00:00
f8f28311bf
stop avatar move to target on parcel ban enforce
2016-01-01 23:03:46 +00:00
7430c629aa
enable the upload region map texture asset for large regions for large regions that i had disabled, but with max size reduced to 512pixels. New viewers don't use this, but osGetRegionMapTexture needs it ( mantis 7787 )
2015-12-24 11:20:46 +00:00
41ae6f06e0
several changes to parcels access control and scenepresence updates rates
2015-12-16 22:16:51 +00:00
1d131a0c33
make parcel bans do something on vehicles. Just a first code, far from good
2015-12-15 21:00:06 +00:00
b7155f5651
fix typo
2015-12-15 18:32:02 +00:00
c7b963df8f
replace GetNearestPoint... funtions
2015-12-15 17:13:32 +00:00
9db987b6f9
some changes parcels AABB math etc
2015-12-15 11:46:50 +00:00
4805e91d39
dont round to nearest int when checking position in parcel since next high int can be on other parcel
2015-12-15 04:10:47 +00:00
35b88b6580
removed unneeded funtions
2015-12-14 12:47:17 +00:00
e37e8c3bdf
on join parcels, keep the information of the larger parcel, since thats how its expected now
2015-12-14 12:29:00 +00:00
2a354f6c28
calculate land startpoint, endpoint and center estimate when it is updated, it not every time they are needed
2015-12-14 11:57:24 +00:00
ca6b5fc80d
taint prim count when join or subdivide parcels
2015-12-13 18:22:46 +00:00
736bcc70fe
change default landpoint type to anywhere (direct)
2015-12-13 18:07:40 +00:00
819fe96503
invalidate LandPoint on land subdivide
2015-12-12 17:32:59 +00:00
4d493dd32e
make sure land access/ban lists are active when changed by new viewers
2015-12-12 15:40:09 +00:00
3781c486c6
fix land access/ban list sending for new viewers
2015-12-12 13:05:24 +00:00
0934e1cf71
add IsEstateManager check to Permissions
2015-12-12 10:03:07 +00:00
c0e920c1ad
Fix Region Max height in boundingSize parameters checking in ArchiverModule.cs to float.MaxValue .. as was changed in ArchiveReadRequest.cs in commit 71f5c2b856 A comparison of consistent 'default' values determines whether boundingBox check is true.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-27 00:16:08 +00:00
15af6265a1
Fixed some stupid math and checks on --bounding-origin and --bounding-size. Bounding origin can of course be negative if it needs to be as we're taking stuff from the (possibly rotated) source region. Bounding size must always be >=0 and <= destination region size.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 17:30:08 +00:00
f75d113230
change silly Monitor use
2015-11-22 08:40:55 +00:00
ec069edead
change syncronization method
2015-11-22 08:31:54 +00:00
e28eecd0bf
revert take the Monitor.wait out of the locks
2015-11-22 08:08:01 +00:00
1de096dffb
coment out merge option on multiregion oar load i added
2015-11-22 08:00:58 +00:00
5c3f88b64d
take the Monitor.wait out of the locks
2015-11-22 07:55:49 +00:00
b80cbf5060
a few more changes on Multiregion control file load
2015-11-22 07:18:11 +00:00
a6187db2a7
add a a missing monitor.wait if still not needed, mb in future
2015-11-22 05:44:06 +00:00
3be340cbf2
a few changes on Multiregion control file load ; load oar seems far from good
2015-11-22 05:42:13 +00:00
f6820959b7
add Monitor.wait on load
2015-11-22 04:49:01 +00:00
4349bde440
reduce noise before compare
2015-11-22 04:10:26 +00:00
6dcbd20cfa
add merge option on multioar test
2015-11-22 03:58:07 +00:00
71f5c2b856
minor changes
2015-11-22 03:56:48 +00:00
541d2ce2cd
don't use 'funny' Quaternions
2015-11-22 02:22:48 +00:00
0b216c37df
Changes to Load Oar options and new code to support importing OARs with different Region sizes to the destination region.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:32:48 +00:00
cc992bf156
Changes to TerrainModule/ITerrainModule to support importing OARs with different Region sizes to the destination region.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:32:36 +00:00
b23e5fd8b6
Changes to LandObject/ILandObject to support importing OARs with different Region sizes to the destination region.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:31:48 +00:00
9566c000f2
work around some 'tests' errors: terrain effects limits changed
2015-11-17 05:25:08 +00:00
1e87e90915
work around some 'tests' errors: allow sitTargetposition and orientation to be read from OAR on opensim, they are reset at avination, this may cause issues with old sits
2015-11-17 03:42:46 +00:00
f57a48a0fb
fix silly bug
2015-11-10 20:34:19 +00:00
5bfd49404d
start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug on slow terrain send limits check
2015-11-10 17:44:53 +00:00
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
9ba288a2e7
fix typo reported on mantis 7735
2015-10-31 22:48:31 +00:00
114ac59314
dont tell clients that we can edit a friend's attachments when we do forbid it
2015-10-27 01:20:21 +00:00
d281ec5342
some fixes/changes on land send
2015-09-30 06:09:01 +01:00
8fde2fb901
slow down terrain sending so other users of LAND queue do have a chance to send things
2015-09-24 00:35:06 +01:00
33b4077c2c
revert my change to the range of greyscale image maps, setting it back to 0 - 127.5 so not to break loading of old files. There isnt a range that fits all needs anyway
2015-09-21 00:44:53 +01:00
fe5807cd09
fix terrain save greyscale mapping to 1:1 suporting standard 0-255m range and not only 0-127m. Jpeg format still using a non standard color encoded heightmap
2015-09-20 15:31:38 +01:00
56a4b5ba7a
put back the hack to make viewers display map tags (now and then at least) that i had removed and do it also on the local region. Make parcel overlay a bit less transparent than i did before.
2015-09-19 21:30:09 +01:00
ba4d0c1c6f
a few more changes to worldMap. Use ExpireCaches, cache remote mapItems requests, etc
2015-09-19 06:42:52 +01:00
87ad573ec2
MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thing
2015-09-18 02:00:10 +01:00
4798cce390
sync remote responses for mapItens with the local ones, but sending all valid information, so later we can cache/throotle
2015-09-17 21:51:51 +01:00
ab18c801a9
dont block a region just bc it doesnt have the requested map item
2015-09-17 21:17:04 +01:00
f4093a04e7
dont create terrain map asset for V1 viewers on large regions again, but do create parcel overlay since current viewers seem to use it (or we are missing something elsewhere)
2015-09-17 21:11:59 +01:00
d767feafa4
generate maptile assets again, v2 do use at least the parcels overlay
2015-09-17 05:24:19 +01:00
f6c2e6e1a3
merge issues and a few more changes
2015-09-17 05:10:24 +01:00
133f3a41eb
remove bad merge code..
2015-09-17 01:43:10 +01:00
2d88e4cf73
mute watchdog timeouts on world map work threads. They do wait for events for a long time
2015-09-15 04:56:26 +01:00
5b3e2ab9aa
Merge branch 'mbworknew1' into ubitworkvarnew
2015-09-08 15:03:22 +01:00
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
7276a89ddd
recover opensim m_sendTerrainUpdatesByViewDistance. if false do as opensim (slower since it depended on sending terrain as TASK). if true send by view range and also all terrain at arrival
2015-09-07 11:23:00 +01:00
abd6640453
allocate llRAW LookupHeightTable on demand and release it, saving a few 512KB of memory
2015-09-07 08:06:41 +01:00
3a8e76cdd1
restore terrain modifiers, left out earlier bc of merge errors, (untested)
2015-09-07 07:50:51 +01:00
94d13c6d22
dont store/upload map asset for large regions, ( needs testing)
2015-09-06 01:21:20 +01:00
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
d00f73c3a4
Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework.
2015-09-04 14:39:23 -07:00
cdaed11387
at last we can login and see objects ( friends is dead and disable in
...
scenepresence)
2015-09-03 18:39:08 +01:00
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
ce2c67876e
More namespace and dll name changes. Still no functional changes.
2015-08-30 21:05:36 -07:00
c24f3b4f5e
minor changes
2015-08-31 04:37:52 +01:00
2c0cad6dd3
Renamed the namespaces too
2015-08-30 20:29:31 -07:00
207dd6da48
fix some effects ranges
2015-08-29 05:28:13 +01:00
8a8acc41bb
stop sending parcel overlays on parcels crossings since SL seems to have
...
stop sending also
2015-08-28 03:59:25 +01:00
c967ecf0c7
also limit terrain flood effects ( like on pait change this should have
...
no visible impact, just cpu saving)
2015-08-28 02:33:54 +01:00
bd4ec5f26c
restrict terrain PaintBrushes to the requested area
2015-08-27 22:36:14 +01:00
195dd054de
make terrain undo non op, it is broken and can't be global but per agent
2015-08-27 21:07:16 +01:00
d1b4e0dd6a
fix terrain bake for revert. just good enought fix
2015-08-27 19:20:41 +01:00
030c866b34
rename revert map as baked map, bc thats what it is
2015-08-27 15:48:13 +01:00
b82b16c954
take taints check terrain out of Onframe event and add a new event for it. Slow it down to 1/4 heartbeat rate (once every 363ms aprox)
2015-08-27 15:01:15 +01:00
f4f3b18221
fix bug
2015-08-25 20:08:05 +01:00
22f573a0be
update raw32 file reader to core one. Warning only suports square regions
2015-08-25 20:00:31 +01:00
244f0c6352
change terrain internal representation to float. ushort work with legal
...
sl terrain, but may break existent terrain and that may cost a lot more
than the cost of memory
2015-08-25 16:51:48 +01:00
64d05bab0f
terrain stored as ushorts with gzip compression
2015-08-25 13:36:45 +01:00
3829df1059
try to implement core load oar options
2015-08-24 17:05:16 +01:00
cbc569a1e0
rename ImapTileModule as IMAPImageUploadModule to match core
2015-08-24 11:06:12 +01:00
e8a75151fa
more on world map
2015-08-23 04:55:18 +01:00
24a093035b
more fixes on map
2015-08-23 01:42:51 +01:00
5da9979024
Warp3D map now seems to work
2015-08-22 16:35:49 +01:00
d22d46ee96
update MapSearchModule
2015-08-22 13:41:45 +01:00
5b03a04fb0
fix worldMapModule
2015-08-22 11:56:01 +01:00
e3d82ad706
delay terrain sending if land queue is 2 busy
2015-08-22 04:08:30 +01:00
17082da0da
"uglyfy" GetModifiedPatchesInViewDistance. Also make it use camera or
...
avatar position
2015-08-21 20:19:04 +01:00
4bb55cad67
dont use SendTerrainUpdatesByViewDistance option, code executes as true.
...
the option will have other use
2015-08-21 03:04:52 +01:00
512c892d83
send regions size on map blocks
2015-08-20 20:18:15 +01:00
2e15ed80cd
fixes on warp3D
2015-08-19 12:08:45 +01:00
0b105da626
Merge branch 'mbworkvar2' into ubitvar
2015-08-19 08:48:50 +01:00
297d31b1c2
Prevent two maptiles being generated at startup, one for v1 and another for v2-3 service. * v1 Service (WorldMapModule) is called directly by scene on startup. This patch moves the initial map registration of the v2-3 service (MapImageServiceModule) to that point so they can share the bitmap instead of doubling the work of Warp3D and exasperate its memory leak issues.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-07-21 15:11:47 -04:00
c37315da87
Warp3DImageModule. Reduce workload by not calling to render the root prim twice. When loading prims to draw the map, the Warp3D system first calls to load the root prim, followed by all the prims in the SOG. The initial call to load the root prim is not required because it is also in the parts list. The result of this was that all root prims were being loaded twice.
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-19 06:56:19 -07:00
81ef7b586e
Address Mantis 7592 ( http://opensimulator.org/mantis/view.php?id=7592 ) by
...
disabling terrain patch sending by view distance for legacy sized regions.
The problem seems to be that people expect adjacent legacy sized regions
to just display like they always have. Limiting displayed terrain is
complicated by the camera position not being updated in child regions.
2015-06-06 07:09:20 -07:00
3c596e47c6
Knocked off a few compiler warnings regarding unused variables.
2015-05-10 21:54:24 -07:00
f20728fc86
Constrain 'terrain modify' to selected Region
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-09 15:25:33 -04:00
dc4c9b1bb0
Minor whitespace removal
2015-05-07 14:09:29 -04:00
a9dd3028b9
Add 'terrain modify noise' and code cleanup
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-07 14:07:50 -04:00
4bf62e11b6
'terrain modify' command for area-of-effect operations
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-06 13:55:22 -04:00
1abbad71b4
Refactored some code that is used in two different dlls related to SOP rewriting. Also added some unit tests that relate to mantis #7514
2015-05-05 20:59:09 -07:00
30f9e5372e
Only send parcel layer data around the point of interest. Can be disabled
...
by setting [LandManagement]LimitParcelLayerUpdateDistance=false
New parameters added to OpenSimDefaults for the distance and enablement.
2015-05-03 21:56:41 -07:00
6081ae3554
varregion: update MapImageModule and ShadedMapTimeRenderer for variable sized regions.
2015-03-29 16:55:18 -07:00
df14b40e88
varregion: update LandManagementModule and LandObject for variable sized regions.
2015-03-29 16:45:00 -07:00
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
bedafb8fae
varregion: refactor use of 'double heightmap[,]' into references to new class TerrainData
...
and push the implementation from Scene into the database readers and writers.
2015-03-27 19:32:50 -07:00
65c0c4be78
Allow re-setting the region restart timer. Also move restart notifications to
...
upper right corner again.
2015-03-23 22:19:33 +01:00
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
0ea6977013
solving HG IM, HGFriends issues based on falsified GridUser data
...
it does not consider GridUser as a viable source for residents' data.
it does not consider Friends, Inventory Creators to be trusted at all. There are lots of broken entries in existence.
There are lots of broken creator data fields in assets.
The following issues arise from the broken data in the old User Management Module:
failing HG IM
failing HGFriends Requests
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-05 16:17:12 -05:00
4717132b82
Use using constructs on disposable io objects in LLRaw to ensure they are always closed even if an exception is thrown.
2015-02-28 00:41:11 +00:00
3c92a8e765
Add OpenSim.Framework using statement necessary to get previous fad4d4dc to compile.
2015-02-28 00:34:07 +00:00
fad4d4dc55
Permit loading of LLRAW files bigger than 256x256 by calculating size based on file size rather than assuming 256x256, same as for RAW32.
2015-02-28 00:26:58 +00:00
e4f0cdd263
Comment out unnecessary "Region Found!" alert message when searching map
2015-02-18 12:52:16 -08:00
1d2616e7a2
If the owner of an object is taking a copy from the scene (e.g. via the "take copy" option on a viewer) then only require owner copy perms, not copy and transfer.
...
This matches Linden Lab behaviour and what was already possible via shift-copy.
Transfer would not apply here as the owner and copier are the same.
This is the only functional change, all other current take copy logic remains the same.
Adds regression tests around relevant take copy cases.
2015-02-03 23:43:30 +00:00
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
fc940ab09a
If a moap entry has EnableWhiteList but WhiteList == null, then properly block the request instead of throwing an exception.
...
Normally, WhiteList is an empty list but from Mantis 7389 it looks like it might sometimes be possible for it to be null (haven't seen this up till now)
It looks like failing with an exception instead of properly replying to the request (which comes in via a cap) might be enough, surprisingly, to freeze a viewer until timeout.
Part of http://opensimulator.org/mantis/view.php?id=7389 but probably unrelated to the actual issue of that mantis.
2014-12-23 20:38:20 +00:00
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
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
d3b43a96fb
Add 'terrain feature' command
2014-11-19 18:18:18 +00:00
f084320976
Actually persist a changed console set agent-limit via "region set".
...
Unfortunately, it's not currently easy to do this with "max-agent-limit"
- this must be separately set as MaxAgents in region config if it's to persist over restarts.
2014-10-31 22:36:08 +00:00
a05be7bd65
Add "region set" console command.
...
This current allows one to set two region parameters
agent-limit <int> will set the current root agent limit for the region, as also settable through the viewer, though some impose a max setting (e.g. 100).
max-agent-limit <int> will set the maximum allowed root agent limit. This can also be set via the MaxAgent parameter in region config.
2014-10-31 21:47:12 +00:00
23fb4f2221
Add "region get" command as a synononym for "show region" console command.
...
This matches existing similar commands and a soon to be added "region set" command.
2014-10-31 21:47:07 +00:00
f39962430c
fix parcel proprieties update sending
2014-10-26 20:43:35 +00:00
c704b079d8
persist script changes to mediaURL and musicURL ( heavy thing )
2014-09-30 04:24:31 +01:00
f117a86c87
fix musicURL change being sent back with wrong snap_selection, and not
...
sent to other avatars.
2014-09-30 03:31:04 +01:00
f0218258d1
When a prim is bought through BuySellModule, the click action is not changed back from buy object. This means that after the object is bought, it still appears as if for sale which can be confusing. This sets it back to touch, the default after sale.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-27 12:54:00 -04:00
9fcee73326
Make "generate map" console command also trigger upload to maptiles as well as asset generation without performing tile generation twice.
2014-09-26 01:02:19 +01:00
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
41f2f3132b
For monitoring purposes, start non-timeout tasks (which do not currently use a threadpool) via Watchdog.RunInThread() rather than Util.RunThreadNoTimeout()
...
The functionality is the same but this allow us to monitor such tasks via "show threads" and abort them for test purposes, etc.
Also extends thread names to provide more info (e.g. SendInitialDataToClient says what client the task is for).
2014-09-05 23:20:59 +01:00
1b75ec5647
Ignore whitespace when reading serialized XML objects.
...
This was previously effectively being done by XmlDocument in the multiple passes through the XML.
This change tells XmlReader to ignore whitespace. This also means changing arguments to use XmlReader instead of XmlTextReader (a descendent of XmlReader) directly.
XmlReader.Create() has been the recommend way to create XML readers since .NET 2.0 as per MS SDK and is the only way to specific ignore whitespace settings.
2014-08-29 19:08:23 +01:00
3555c0c3f3
Fix recent regression test TestDeserializeXmlObjectWithOtherParts() which was not meant to indent the input xml
2014-08-29 18:14:47 +01:00
305c3e668a
Add regression test for deserializing xml objects with more than one non-root part.
2014-08-29 18:06:29 +01:00
bafa82eb12
Remove race conditions from where SP.AbsolutePosition could change between the various property checks.
2014-08-26 18:25:14 +01:00
2924d250ab
Fix short help string for show region command.
2014-08-06 21:41:53 -04:00
14250c776a
missing currentParcelUUID update
2014-08-03 23:44:51 +01:00
0d71a2bb8f
mess update ( hide avatars )
2014-08-03 22:38:50 +01:00
74447d14cd
add some filters for NPCs
2014-08-02 18:32:28 +01:00
ef1f37cf20
handle change of hide avatars flag. Parcel limits edition still need work
2014-08-01 18:59:08 +01:00
cb43dff2dc
remove unnecessary sendparceloverlay
2014-08-01 02:55:34 +01:00
a5e9429f2b
MESS: changes in MakeRootAgent and CompleteMovement reordering things.
...
Added sending of land overlay and parcel information. This in order to
only send avatar related information after having its position well
defined and on the right parcel. THIS MAY STILL BE BAD :)
2014-07-31 03:10:50 +01:00
17f9f1c247
restrict other avatar sounds to parcel flags ( untested )
2014-07-30 16:32:25 +01:00
5fe1f87837
changes to parcels code (still more to to)
2014-07-30 14:53:56 +01:00
a4107cb6c7
In TerrainModule, lock m_perClientPatchUpdates when removing entries.
...
This may have been the trigger CheckSendingPatchesToClients() dictionary out of sync exceptions in today's load test.
Don't need to check ContainsKey() since Remove() returns false on a request to remove a key that it doesn't have
2014-07-29 23:39:10 +01:00
6a0be97974
Correct nomenclature for LLSD messages. LL sure suck
2014-07-29 05:06:53 +02:00
0c2537bb24
Try to plumb the other half
2014-07-29 04:41:38 +02:00
181142c5ce
Change some ORs to assignments as they should be
2014-07-29 02:37:36 +02:00
6b0521d3c9
fix the mess about exclusive fields and flags on land overlay
2014-07-29 01:24:43 +01:00
3e1d2df261
change parcel overlay bytes adding LocalSound.. changed others also NEEDS
...
checking
2014-07-29 00:39:08 +01:00
f32bd24a2c
dont mess with sound gain on stop
2014-07-27 17:03:53 +01:00
c3b5a6c2ab
change how sounds work. May be bad.. needs testing
2014-07-27 08:18:27 +01:00
b481711fa6
Added locking in AccessModule to prevent possible errors when shutting down a simulator that has >1 region
2014-07-21 09:19:05 +01:00
05cacf6eb6
Eliminated common but un-useful log messages
2014-07-21 09:18:20 +01:00
f94b3bbe0f
Minor: changed "existant" to "existent"
2014-07-21 09:15:05 +01:00
99ac770abb
Close streams immediately when we finish using them
2014-07-21 08:30:03 +01:00
b81187db5a
Set "[Terrain]SendTerrainUpdatesByViewDistance=true" by default.
...
This, by default, enables terrain patches being sent to each avatar
from the avatar away (rather than the old outside-in pattern), only
sending terrain patches within the avatars view distance (making
view loading quicker), and sending multiple terrain patches per
protocol packet (making terrain loading and editing quicker).
2014-07-20 10:56:52 -07:00
4dc0aaa03f
minor: Add meters unit to water height console display
2014-07-18 23:57:33 +01:00
1bdf0bed9c
Add "show region" command which will show parameters for current region.
...
This shows static data (e.g. region agent limit) whereas "show scene" shows live data (sim fps, current prims, etc.)
2014-07-18 23:52:49 +01:00
e455374a4b
fix all instances of "non-existant" to "non-existent" (spelling mistakes) thanks Ai Austin for pointing this out.
2014-07-17 09:37:24 -04:00
ca2379ee83
Bug fix in map teleports in varregions. The cherry was missing from the ice-cream Sunday: the packet itself was hardcoding the size of the region...
2014-06-21 15:38:38 -07:00
159fcbf150
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
c5f7184d1b
Behavior change: only local users can set home in any parcel of a grid. Setting it for foreign users does not make sense, since cntrl+shift+H always teleports them back to their original grid.
2014-06-15 16:29:25 -07:00
0aa0dad478
Send multiple terrain patches per terrain update packet if terrain
...
draw distance optimization is enabled. Makes terrain editting a lot
snappier.
2014-06-01 19:23:49 -07:00
3aa99b9a7f
Fixes a permissions bug where a user with group powers to always rez was not being given permission to rez on group land.
2014-06-01 16:45:37 -07:00
94d0ae0d91
This may fix mantis #7200 , but I am unable to test because I don't have any old viewers around anymore.
2014-06-01 10:18:53 -07:00
0eaca7aafb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-06-01 10:06:59 -07:00
2ff9ea3f80
Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector.
...
Also added more packing/unpacking code.
2014-06-01 10:06:26 -07:00
0300ec45eb
Modifications to debugging printouts. No functional changes.
2014-05-31 12:19:51 -07:00
22dade6463
varregion: More tweeking to only sending patches within avatar draw distance.
...
Still has problems with child avatars.
2014-05-31 12:19:50 -07:00
db5a42ffac
varregion: send terrain patches from where the avatar outward if the parameter
...
[Terrain]SendTerrainUpdatesByViewDistance=true.
This tracks which patches have been sent to each client and outputs the
patches as the avatar moves.
2014-05-31 12:19:49 -07:00
8656b5e948
Fix bug where setting a parcel in a varregion for sale would make sale bitmap generation in WorldMapModule throw an exception on next startup.
...
This commit replaces the hardcoded region sizes in WorldMapModule.GenerateOverlay() with numbers pulled from m_scene.RegionInfo
2014-05-30 19:40:10 +01:00
e19c830a6c
Fixes a bug where map search results pertaining to varregions would only send the SW-most corner of the varregions; the other areas, when clicked, would result a blue circle, meaning that the viewer didn't know about those areas. This is still not quite right, as all the areas appear to be in the same coordinates, but it's good enough for now.
2014-05-27 10:13:24 -07:00
33cc847c4a
When saving an OAR in "Publish" mode, also discard Group information
2014-05-26 15:33:13 +01:00
a1b291c889
Allow map searches for regions that contain the characters "!+|"
...
These characters are used as placeholders for other characters: ": /". But we should search first for the exact string the user entered, and only if that fails then replace the characters and search again.
2014-05-21 07:39:23 +01:00
0c0ee95bd8
minor: Clean up and make consistent some log file messages in EstateManagementModule relating to RAW file uploading.
2014-05-14 19:22:55 +01:00
78015bbbdc
Console commands for Estate Mgmt
2014-05-06 18:55:42 +01:00
9e83b43009
new version of patch to add default-user switch new version :qw :wq updated version of default user switch for load oar :q :q
2014-05-06 18:48:59 +01:00
8b3c2f7d0c
updated version of default user switch for load oar :q :q
2014-05-06 18:48:42 +01:00
7bb673a854
minor: Correct mistake in terrain flip error message from previous commit 5d01a1f
2014-04-30 19:41:11 +01:00
5d01a1ff4d
minor: Print output in response to terrain console commands on the console rather than in the log.
2014-04-30 19:24:17 +01:00
253110293a
Add "terrain show" console command which outputs terrain height for a given region co-ordinate.
...
For debug purposes.
2014-04-30 18:04:47 +01:00
df89e15290
BulletSim: non-functional changes to debugging statements and formatting.
2014-04-28 18:36:50 -07:00
d97896d39a
Differentiate between requests only the owner should be able to do and those
...
that managers can do when setting parcel data
2014-04-26 20:32:27 +02:00
38acda9f29
Add regression test for terrain fill at two digit height and max ll height.
2014-04-25 23:01:24 +01:00
2572ed9ed9
Adjust permissions to work hand in hand with what the viewer believes they are.
...
This fixes the issue of "Show in Search" seeming resetting at random.
2014-04-25 00:35:53 +01:00
7180690a14
Show Group name when land is group-owned
2014-04-23 23:29:17 +01:00
c77cd6adc7
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
2014-04-23 22:59:28 +01:00
fb321a0573
Prevent sending Land Properties for unprivileged users
2014-04-23 22:59:13 +01:00
5092cbd77e
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
2014-04-23 19:55:51 +01:00
cb1f2886cd
Prevent sending Land Properties for unprivileged users
2014-04-23 19:50:59 +01:00
998d7009a6
Eliminated many warnings
2014-04-23 16:37:36 +03:00
090f9bcece
Fixed: once a user has rezzed an object, they could then duplicate it as much as they wanted even if the parcel's permissions had since been changed to disallow rezzing
2014-04-20 06:23:36 +01:00
3185db7f94
Fixed: if a user belonged to the parcel's group then he was allowed to rez object in the parcel even if the flag "Create Objects by Group" was disabled
2014-04-20 06:23:36 +01:00
a780e01a54
Fixed: the parcel flag "Allow Scripts from Group" should only check if the parcel has a Group set; it doesn't have to be *deeded* to the group
...
Also some cleanup of the use of Group ID's (with no change to functionality).
2014-04-20 06:23:35 +01:00
32ad66c274
Allows to sell objects on a parcel of land together with that parcel of land. The objects that are sold together with the parcel of land need to fulfill the following preconditions: owned by the current parcel owner, not set to a group, transferrable. This feature does not work for group owned parcels or land bought by a group.
2014-04-10 11:47:46 +02:00
6b1d09813e
remove some whitespace that snuck in with last patch
2014-04-03 13:25:32 -04:00
50eec6df52
Add Varregion support to Terragen Handler
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 13:14:13 -04:00
4aa483777b
Move new Estate commands to OpenSim.cs
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 12:45:43 -04:00
ac16a667e1
fix orphaned code in sun module per mantis 7068
2014-04-01 19:48:03 -07:00
e5a5b69b08
remove EstateManagmentCommands.m_commander that has been unused for some time
2014-04-02 01:23:40 +01:00
43eab5e163
Console command to rename Estate
2014-04-02 01:17:41 +01:00
635f3f77ab
Console command to change Estate owner
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-29 00:59:15 -04:00
6557eba235
Removed default timeout when starting scripts after Load OAR
2014-03-28 13:04:19 +03:00
b0bae62c30
refactor: Actually use MaptileStaticFile in RegionInfo rather than having both a public field and a get property
2014-03-26 20:58:58 +00:00
e131e73652
Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout)
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:55 +01:00
17aeec8860
Reinstate the timed region change signal
2014-03-25 03:16:37 +01:00
091f3a8000
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-25 00:20:38 +00:00
e12c044eab
Don't fail to enable permissions modules correctly if there is any leading or trailing whitespace between comma separate module combinations.
2014-03-25 00:19:24 +00:00
1a32b35279
In Load OAR, correctly restore group-owned objects
...
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24 18:18:23 +01:00
305f5110c6
In Load OAR: Zero isn't a valid Group ID
...
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24 18:18:08 +01:00
35078e03e5
During Load OAR, fix the User and Group ID's in objects that are embedded in assets (previously only rezzed objects were fixed)
...
Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-03-24 18:17:59 +01:00
6edc446780
Fixed: OnRegionInfoChange was never triggered
...
Resolves http://opensimulator.org/mantis/view.php?id=6934
2014-03-24 18:01:22 +01:00
bf68dbabd7
Save to database these parcel updates: Force Owner, Abandon Request, Reclaim. (Previously these updates only changed the parcel in memory)
...
Resolves http://opensimulator.org/mantis/view.php?id=6934
2014-03-24 18:01:08 +01:00
da25903300
Adding a way to disable/enable the in built Dwell Module
2014-03-20 22:35:50 +00:00
b5f94c72b9
Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles
2014-03-19 11:16:52 -04:00
61353dde80
Allow Region specific static maptiles to be loaded from file.
2014-03-18 22:18:50 -07:00
86630a1b70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-11 23:39:07 +00:00
d975b42f6a
Instead of auto-creating a parcel on request if one doesn't cover a given location, fill in gaps or extend existing parcel right after initial data load.
...
This is in line with simpler and still existing behaviour where a default parcel is created if no parcels are in storage at all.
Making this change as another step to address current problems with spurious parcels occasionally being created.
Also adds regression tests for different load behaviours depending on existing stored parcel data.
Relates to http://opensimulator.org/mantis/view.php?id=7035
2014-03-11 23:38:22 +00:00
8edf4225f3
varregion: remove serialization of region terrain to floats when sending patches.
...
This should eliminate much memory thrashing and CPU usage while sending initial
terrain.
The old way of passing terrain was to convert it to an array of floats. This is
really bad for large terrain (think 4096x4096 floats). This change passes a dummy
float array since the real region info is used anyway and the floats are ignored.
(The ignoring the terrain floats is a kludge so as to not change IClientAPI.)
2014-03-11 07:12:47 -07:00
742f505440
Change terrain update sending to be triggered by frame tick rather
...
than everytime terrain is changed.
The TerrainModule now hooks the frame event and, if terrain has changed,
sends terrain updates to the clients. This polling pattern replaces
the previous push on change pattern and will make it easier to do per
client throttling and per scene presence terrain update ordering.
2014-03-10 22:05:18 -07:00
8225e3f40c
Remove try/catch in LandManagmentModule.GetLandObject() - this is very old code and the caught exceptions can no longer occur.
2014-03-07 01:41:31 +00:00
3c05d67094
Lock m_landlist whilst loading parcels from storage to prevent a race against any parcel auto-creation in GetLandObject()
2014-03-07 01:36:06 +00:00
6b7625a56b
Only auto-create a land parcel when there is none in a specified tile if there is more than 1 existing land parcel.
...
This is because there are still issues with bad parcels being generated in http://opensimulator.org/mantis/view.php?id=7035
Theorizing now that it's possible that something is calling GetParcel() before any parcel data has been loaded from persistence.
2014-03-07 01:23:19 +00:00
ddd38a3dea
Add scene name to bad parcel add logging
2014-03-06 19:12:16 +00:00
58c0ed78d4
refactor: Simplify land object by using c# get/set auto-properties where applicable.
2014-03-06 02:12:58 +00:00
470d053443
minor: slightly simplify code in LandObject.ContainsPoint()
2014-03-06 00:51:39 +00:00
ed14e97bb4
Remove array initialize calls in LMM - these are unnecessary as the VM already does this.
2014-03-06 00:46:16 +00:00
aa2fb1ec25
minor: Increase size of parcel name field in "land show" console command output. Construct table using CDT rather than string formats
2014-03-06 00:40:24 +00:00
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
5038a59ef3
Maybe slightly reduce warp3d memory leakage by disposing of decoded bitmap in Warp3DImageModule.GetTexture()
...
However, this still appears to be leaking massively, at least for me. Possible cause is warp3D using GDI objects internally and not disposing of them.
2014-02-28 00:16:06 +00:00
11b4f534c2
If texture decode fails in Warp3D map maker, log uuid of asset that failed to decode along with exception
2014-02-20 23:36:50 +00:00
79200ed270
Fix displacement and location operations on legacy trees and grass in
...
the 'load oar' and 'scene' commands. Before they were ignored but the
code now relies on the SOG.IsAttachment function for attachmentness.
2014-02-15 17:10:20 -08:00
bdbbeaa494
Non-functional changes of numbers into symbolic references and a few
...
comments on what variables really mean.
2014-02-15 16:01:01 -08:00
1b41ec0a85
Fix raw32 terrain heightmap reader so it estimates terrain size from
...
the size of the input stream. This is required since the raw heightmap
format (.r32) does not contain any size information.
The estimation relies on terrain being square.
2014-02-03 21:23:32 -08:00
41b6602a77
Add "--no-objects" parameter to 'load oar'.
2014-02-02 22:16:01 -08:00
8c6a0cb44a
Really add the old parameter names to load oar to keep downward compatibiliy
2014-02-02 17:18:08 -08:00
2a4dd34616
Change new 'load oar' parameters to be hyphenated to be consistant with
...
existing parameters. ('--forceterrain' becomes '--force-terrain').
The old forms have been kept for downward compatiblity.
2014-02-02 12:21:18 -08:00
9c97fb8e12
Implement terrain merging in TerrainChannel.
...
Modify archiver to use terrain merging when loading oars.
This makes displacement AND rotation properly work on terrain when loading oars.
Especially useful when loading legacy region oars into large varregions.
2014-02-02 11:17:49 -08:00
b2878eb773
Merge branch 'justincc-master'
2014-01-31 00:51:22 +00:00
b8e22f02e7
Make sure Web streams are disposed after use
2014-01-31 00:44:22 +00:00
fbf33ef1de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 22:42:35 -08:00
3f5c6c897f
One more run at fixing the sun module. Parameter setting fixed to
...
work through the OSSL interface. And setting the parameters now
adjusts all the dependent variables correctly so the sun moves
at the modified rate.
2014-01-28 22:40:39 -08:00
1900254e77
Restore brush tests with correct values and adjustments for new terrain height
...
rounding characteristics.
2014-01-28 21:43:18 -08:00
678c107915
Temporarily disable brush test. It will come back when tuning is complete.
2014-01-28 16:58:27 -08:00
dde0e547a7
Change area of brush test to account for rounding errors in terrain implementation
2014-01-28 16:48:34 -08:00
226b5e4d75
Increase the strength of brushes in brush test in an attempt to overcome rounding
...
introduced with new terrain height class.
2014-01-28 16:36:56 -08:00
cfe1bced7d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 16:34:49 -08:00
2877c7d94d
Actually make the parameter updates change the behavior of
...
sun movement.
2014-01-28 16:34:22 -08:00
0c3493f619
clear land tainting when tested. Then testing, pass scene to LandObject as now needed to get region size
2014-01-28 16:25:01 -08:00
d25265ae82
Fix terrain tests by properly initializing low detail terrain to zero height.
...
Also remove PI heightmap test as new heightmaps only have two significant digits.
2014-01-28 15:58:45 -08:00
bfb0011cd3
Some major surgery on the sun module. Updates to the client were gated
...
by a "mode" check. That mode check has been removed (it didn't result
in any change of behavior anyway). Also added a command line variable
update to set the sun position time offset (offset from the system
clock). Default is no offset to preserve existing behavior.
2014-01-28 15:43:47 -08:00
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
49af6b53e7
varregion: enable teleporting to a varregion by clicking on the map and
...
pressing the 'teleport' button.
This commit adds returning region map info for all the subregions of a
varregion. This also handles the selection of the extra region and then
the displacement of the postion so the teleport is to the correct location.
2014-01-26 19:32:28 -08:00
13a9d5409c
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
2014-01-26 07:56:47 -08:00
6831e58616
varregion: modify MapImageModule structure so it will better merge
...
with changes made in master.
2014-01-26 07:38:28 -08:00
966ab21839
Merge branch 'justincc-master'
2014-01-24 00:17:39 +00:00
a2d5d810e0
Properly dispose of drawing objects to reduce/stop memory leakage on generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
2014-01-24 00:14:58 +00:00
a859464e91
Add "generate map" console command to allow manual regeneration and storage of maptiles
...
Primarily for test purposes though could be useful if one prefers to manually update the map tile
2014-01-23 23:44:21 +00:00
4c362a83f9
Merge branch 'master' into varregion
2014-01-21 11:31:51 -08:00
2cf7478b9a
Merge branch 'justincc-master'
2014-01-20 19:34:55 +00:00
8e72b53edc
Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points.
2014-01-20 19:16:19 +00:00
3018b2c5d7
Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default
...
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
2014-01-20 00:38:42 -08:00
90fa3202c6
varregion: remove debugging splat file saving that fills up the
...
maptile dir and causes errors.
2014-01-19 13:37:51 -08:00
5e6a47f13f
varregion: remove --noterrain and --noparcel parameters in 'load oar'.
...
Add --forceterrain and --forceparcel to 'load oar'. In order to not change
the operation of --merge (which does an object merge and suppresses terrain
and parcel information loading), added the --force* parameters to be used
when loading multiple oars to build up a varregion.
Added --rotation and --rotationcenter parameters to 'load oar' which apply a rotation to
the loaded oar objects before displacing. The rotation is in degrees (pos or neg)
and the center defaults to "<128, 128, 0>".
2014-01-19 12:45:16 -08:00
6fbfb47b92
varregion: add --noterrain and --noparcel to 'load oar'.
...
--noterrain suppresses the loading of the terrain from the oar.
--noparcels suppresses the loading of parcel information from the oar.
2014-01-19 11:03:08 -08:00
dd6db72939
varregion: add --displacement parameter to 'load oar'.
...
Adds displacment to all objects and terrain loaded from the oar.
As an example, if you have a 512x512 region and an old 256x256 oar, doing
load oar --displacement "<128,128,0>" oarFile.oar
will load the object (and terrain) into the middle of the 512x512 region.
If displacement is not specified, 'load oar' works like it always has.
If you have a 5
2014-01-19 10:09:43 -08:00
54a4b9eab4
varregion: Update Warp3D to properly handle varregions.
...
This includes additions to Warp3D:
Optional rendering of mesh and scupltie prims (INI parameter. Off by default)
Texturing of large prims (INI parameter. On by default)
Better garbage collection
2014-01-19 07:33:56 -08:00
60de0bc3c2
varregion: split up generated maptile images for storage in map. This
...
makes maps for varregions show up properly.
2014-01-19 05:09:03 -08:00
1cf17a3cf7
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
2014-01-11 08:52:23 -08:00
5e72de1908
Merge branch 'justincc-master'
2014-01-10 20:19:38 +00:00
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
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
2d2bea4aa7
varregion: many more updates removing the constant RegionSize and replacing
...
with a passed region size. This time in the map code and grid services code.
2013-12-26 22:45:59 -08:00
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
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
bf826699a5
Merge branch 'justincc-master'
2013-12-14 01:13:17 +00:00
d656ec2a07
Make WindParamSet success a console message rather than a log message.
...
This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
2013-12-14 01:07:37 +00:00
5ddd818238
minor: Make wind console commands print out to console rather than log
2013-12-14 00:50:06 +00:00
5b73b9c4a8
Committing the Avination Scene Presence and related texture code
...
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
2013-12-11 01:39:56 +00:00
7aa00632b9
varregion: many replacements of in-place arithmetic with calls to
...
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
2013-11-28 08:20:16 -08:00
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
604b39cea9
Merge branch 'master' into varregion
2013-11-15 14:56:13 -08:00
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
b4932bda2a
If a local land ID is given to the "land show" command, then output to console the full details of that parcel.
...
Using "land show" without a land ID still outputs a summary of parcels in the region
2013-11-15 00:16:33 +00:00
e2a1fa806d
varregion: extend TerrainModule to use the region size from RegionInfo
...
rather than using Constants.RegionSize. This allows loading and saving
of terrain heightmaps that match the size of non-legacy sized regions.
2013-11-10 21:12:17 -08:00
c12e68e34d
varregion: fix GetLandObject error return and initialization of square
...
land object bitmaps. This fixes creation of child presences and the
editing of parcels.
Also lots of commented out debugging messages.
2013-11-10 19:52:31 -08:00
beeec1c467
varregion: elimination of Constants.RegionSize from all over OpenSimulator.
...
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
2013-11-08 20:53:37 -08:00
a7a837550e
varregion: Massive work to LandManagementModule and LandObject to
...
handle variable sized regions. Many changes for both the region and parcels.
Most of the constant "4" (for the 4x4 parcel units) have been replaced
with symbols and math.
2013-11-08 20:51:09 -08:00
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
2be0347f50
Merge branch 'master' into varregion
2013-10-28 09:30:26 -07:00
31989bd51e
Show texture ids for full object/part info console commmds
2013-10-24 21:29:57 +01:00
8937a2244d
Merge branch 'master' into varregion
2013-10-16 07:53:44 -07:00
97bc5263de
varregion: move the compressed heighmap compression factor from
...
Constants into TerrainData.
Save compression factor with the terrain blob in the database.
2013-10-16 07:52:30 -07:00
f106ba87ca
Made terrain uploads thread-safe
2013-10-15 00:12:56 +01:00
75fdd6054d
* Refactor
...
* Break out common BasicDOSProtector code into separate class.
2013-10-07 23:19:50 -05:00
f76cc6036e
* Added a Basic DOS protection container/base object for the most common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler
...
* Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice.
* Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers
* Added CircularBuffer, used for CPU and Memory friendly rate monitoring.
* DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
2013-10-07 21:35:55 -05:00
7416809077
varregion: plug in TerrainData class and modify TerrainModule and LLClientView to use same. This passes a terrain info class around rather than passing a one dimensional array thus allowing variable regions. Update the database storage for variable region sizes. This should be downward compatible (same format for 256x256 regions).
2013-10-07 13:57:40 -07:00
UbitUmarov