51ca84afdf
coment out mesh model upload code to add textures and individual meshs
...
assets to inventory, since it may actually be a bad ideia since good
model textures are deply related to it and there is no current use for
independent mesh assets. Added the option to have a reduced free for textures (2.5 C$ as is, total textures cost rounded to nearest int) compensating for the fact that they can't be used outside the model or its parts.
2012-09-19 00:29:16 +01:00
9d973ec3b3
Cleanup from prev. commit
...
Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
2012-09-18 10:12:32 -04:00
d29fc53052
Fix some inconsistencies in configurartion: NonPhys prims
...
Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*.
Please update your OpenSim.ini and Regions.ini to reflect these changes.
2012-09-18 09:53:45 -04:00
ac2380bbfa
Add booleans to control whether we actually crete inventory items
2012-09-18 02:12:07 +02:00
e8ba26eac8
***TEST*** still bad... create inventory itens for model textures and meshs. Issues: meshs get into root folder, viewer and viewer does not update inventory until relog ( the upload funtion needs to return more information) ,etc. Droping a mesh into a prim, makes viewer think we dropped a sculpt map, but it does work, viewer displays the mesh and physics work (as physics is stored at the sculpt information fields). Textures show up in Textures folder, just its to costly to find that default folder as is..
2012-09-18 01:07:44 +01:00
fd20ef5c91
add some locks to GetTextureModule
2012-09-17 22:35:36 +01:00
c1eec3b828
on upload store mesh list contents as mesh assets. Build prims by instances not
...
meshs. (some prims can have same mesh)
2012-09-17 21:15:07 +01:00
c3666c9ec3
make sure client still has money at upload
2012-09-17 19:38:05 +01:00
7f5b1182ef
same cleanup
2012-09-17 19:09:51 +01:00
1740325392
removed broken fee compression
2012-09-17 17:49:10 +01:00
91312daeb2
Moving ScriptModuleComms into the CoreModules tree.
2012-09-17 09:04:54 -07:00
df77724bbc
let mesh model estimator work even without money module, so other
...
estimations can work
2012-09-17 15:50:59 +01:00
5915dfc26f
Make use of mesh cost functions
2012-09-17 15:37:05 +01:00
d739246030
Merge branch 'master' into careminster
2012-09-17 14:18:03 +01:00
0e5f5538bc
Documentation of IScriptModuleComms.RegisterConstant and IScriptModuleComms.LookupModConstant
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-17 14:15:52 +01:00
f9721573d9
Implementing ability to register script constants and invocations on a region module automatically
2012-09-17 14:15:47 +01:00
1dd75fcdb4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-09-17 14:15:22 +01:00
5bbc4fb2a5
missing file for suport of mesh upload cost
2012-09-17 13:39:38 +01:00
c7948a669a
preventing a null reference exception from being thrown
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-17 13:29:15 +01:00
5e626ce55d
script invocations cannot have void return type
2012-09-17 13:29:01 +01:00
f2308c819e
Remove spammy "axislock" debug.
2012-09-17 12:58:59 +02:00
380962d359
HG2.0: Generalized the allowed HG appearances to be more than 1.
2012-09-16 16:45:57 -07:00
a79bafaaaf
Change the close tmeout from 2 to 3 seconds on teleport. This may
...
prevent being logged out after a successful teleport.
2012-09-16 22:52:45 +02:00
7d5942d154
Make IncomingCloseChildAgent not send a stop packet. This may prevent
...
a viewer from being logged out after an otherwise successful teleport.
2012-09-16 22:51:04 +02:00
a76ce4f64d
Make the agent being kicked a child agent first so there won't be a ghost
2012-09-16 22:50:35 +02:00
66bf1376b5
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
2012-09-16 04:21:18 +01:00
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
daa4745fb7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-15 19:35:33 -07:00
de69a24574
More on HG2.0: added the possibility of controlling the appearance that avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
2012-09-15 19:33:51 -07:00
b602b476ad
BulletSim: update DLLs and SOs and remove some debugging code.
2012-09-15 15:36:13 -07:00
c77be802d2
BulletSim: some debugging prints in BSPrim for tracking changes in linkset children.
2012-09-15 15:32:16 -07:00
1826b2b18e
BulletSim: add the debugging routine DumpRigidBody2() to API2.
2012-09-15 15:32:11 -07:00
f35bd6eb7d
BulletSim: another attempt at computing physics FPS correctly.
2012-09-15 15:32:05 -07:00
dcb94b8a24
BulletSim: remove timeStep parameter from calls for vehicle parameter setting. There is no reason these should be using the simulation time interval for parameter calculation.
2012-09-15 15:31:59 -07:00
6632eb7c05
BulletSim: Remove calculation and passing of unused collied object type.
...
Fix collision code to properly sense mega-region children regions as terrain.
When setting an object physical, reset all the physical properties (friction, ...).
2012-09-15 15:31:54 -07:00
f0a098924e
BulletSim: set all linkset objects center of mass to the whole linkset's center of mass
2012-09-15 15:31:49 -07:00
7c347f4c5c
BulletSim: Add calls to linkset class when object going static or dynamic.
...
Reset center of mass on an object when going dynamic.
2012-09-15 15:31:44 -07:00
d86cbe6379
BulletSim: remove unused NeedsMeshing() code from BSScene.
2012-09-15 15:31:39 -07:00
c0fec70b1a
BulletSim: Add 'IsNativeShape2' call
2012-09-15 15:31:34 -07:00
2c5ff93990
BulletSim: Way too many changes in one commit.
...
Many changes to BSDynamic for readability and commentary.
Linkset hacking for vehicles: don't over mass the root prim.
Add parameter for link constraint solver iterations.
Correct uses of timestep in timescale calculations for vehicles.
Reorganize code/logic for making objects static and dynamic for readability
and use of API2.
Changed most calls in BSPrim to use API2 calls (the new way).
Avatars do not generate default Bullet collision events but do call up
to the simulator for every avatar. Reduces overhead.
Objects added to collision list only if they are processing collisions.
Reduces overhead especially for large numbers of avatars.
Generalize call for water height to GetWaterHeightAtXYZ().
Catch and correct exception getting terrain height when out of bounds.
Correct race condition in Terrain Manager where creation wasn't at taint-time.
Add API calls for constructing compound shapes.
Move NeedsMeshing() logic into object class.
Reorganize logic for object meshing to reduce rebuilding of meshs/hulls.
2012-09-15 15:31:29 -07:00
1ec84ac8b1
Add basic asset connector tests to check behaviour for normal, local and temporary assets.
...
Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load
Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
2012-09-15 02:12:26 +01:00
d5c8c6bc12
For FlotsamAssetCache, always update access times of cached scene assets before looking for files to expire.
...
This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed.
The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced.
This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
2012-09-15 01:08:15 +01:00
5dd2569bf7
Added unit tests for multi-region OARs
2012-09-14 20:32:25 +01:00
d7e6fe488d
Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the multi-OAR patch there is now only one class that handles this operation.
...
Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105
since that did not directly apply
2012-09-14 20:25:44 +01:00
ce468215d5
Support multi-region OAR files
...
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
2012-09-14 20:25:03 +01:00
387e59ff7f
Revamp the HTTP textures handler to allow a maximum of four fetches
...
at any time and to drop requests for avatars n longer in the scene
2012-09-14 21:24:25 +02:00
45fe25de0d
Allow some more connections to try to ease lag.
2012-09-14 00:14:39 +02:00
f14b257fc0
Wait longer for arrival cofirmation to aid tps into laggy regions
2012-09-14 00:13:08 +02:00
e1e9855ede
Wait a bit longer for new scene presences to aid tps into laggy regions
2012-09-14 00:12:41 +02:00
dd0a89a0e6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-13 10:00:52 -07:00
190f9c258b
Restarting to work on HGSuitcaseInventoryService: added the ability for the outside world to retrieve appearance items. Not ACLed yet.
2012-09-13 10:00:29 -07:00
46d8405229
Documentation of parcel-related events
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-13 09:59:25 -04:00
9598c1af9e
correcting a typo that causes c# express to complain about xml comment containing invalid xml
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-13 09:59:25 -04:00
e7932682a2
Add a logger so the prior commit will work
2012-09-12 21:24:09 +02:00
d8e9188908
Stop expiry timer when upload is complete. Log if timeout is reached.
2012-09-12 21:14:55 +02:00
5139db2638
Add a timer to time out upload caps handlers that are not used.
2012-09-12 12:56:59 +02:00
224efe7b76
minor: Comment out friends notification log spam for now.
2012-09-12 01:58:01 +01:00
ebb394bbda
Fix indentation and issues where tabs were used instead of spaces in commit 783ee949
2012-09-12 01:45:34 +01:00
4ead48f09f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-12 01:24:17 +01:00
41f3f2400e
Documentation of economy-related EventManager events
2012-09-12 01:23:47 +01:00
f06394f195
Allow an incoming identifier to be specified for a JsonStore.
2012-09-11 16:42:07 -07:00
d53a53d4c5
Make "show http-handlers" command available for ROBUST instances as well as the simulator executable.
2012-09-12 00:10:48 +01:00
fd1ee58f87
Add a missing brace, remove a useless temp variable, enable charging.
2012-09-11 22:52:11 +02:00
013e94af5d
report mesh upload costs ( fake values)
2012-09-11 23:06:29 +01:00
245763b1b0
let LLSDAssetUploadRequest include asset_resources information plus let
...
NewAgentInventoryRequest know about mesh (does nothing with it still)
2012-09-11 20:30:30 +01:00
ad1b9bbba6
documentation (OnSceneObjectPartCopy)
2012-09-11 20:12:45 +01:00
97b8739c1d
documentation (OnRemovePresence)
2012-09-11 20:12:45 +01:00
0760121eb9
documentation (OnNewPresence)
2012-09-11 20:12:44 +01:00
0a22e78f59
documentation (OnClientConnect)
2012-09-11 20:12:44 +01:00
5e51f16ceb
documentation (OnBackup)
2012-09-11 20:12:44 +01:00
fd8a7e64b9
documentation (OnTerrainTick)
2012-09-11 20:12:44 +01:00
ed5f574356
documentation (OnTerrainTainted)
2012-09-11 20:12:44 +01:00
44349f742e
documentation (OnClientMovement)
2012-09-11 20:12:43 +01:00
e3993eefa5
Documenting some of the events on OpenSim.Region.Framework.Scenes.EventManager (OnFrame)
2012-09-11 20:12:43 +01:00
19b00a5b3c
Removing the variable prica handler again. It's never called, was misnamed and
...
probably never worked past the mesh beta.
2012-09-11 17:58:46 +02:00
757a669924
Re-add the module and fix a typo
2012-09-11 17:55:33 +02:00
375ca478dd
Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice
...
which is the name actually used in viewer code.
2012-09-11 17:52:24 +02:00
a6928a479e
Add cost calculation suppor tto the VariablePrice one as well
2012-09-11 17:51:20 +02:00
ead4b8998c
Revert "Remove the unused NewFileAgentInventoryVariablePrice module."
...
It's actually used.
This reverts commit 94a8e5572b
2012-09-11 17:28:37 +02:00
bd1d9a214b
Add the option to have variable costing for uploads
2012-09-11 17:28:13 +02:00
94a8e5572b
Remove the unused NewFileAgentInventoryVariablePrice module.
2012-09-11 15:07:32 +02:00
a6753c14a5
Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
...
leverage the Poll Service without blocking it's workers.
2012-09-11 10:39:43 +02:00
21c476228a
Merge branch 'avination' into careminster
2012-09-10 13:53:00 +01:00
3e1b6b8d20
Merge branch 'master' into careminster
2012-09-10 13:33:47 +01:00
8db5d79f4b
passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly error messages
2012-09-10 13:15:32 +01:00
657428a439
Remove commented code
2012-09-10 01:52:02 +02:00
761bf8c1eb
Merge branch 'ubitwork' into avination
2012-09-10 01:50:41 +02:00
b7737b7273
webFetchInventory: change control event to simple flag, adjust locking
2012-09-10 01:20:34 +01:00
bf56b30024
Adjust namespce of FlotsamCache
...
Place FloatsamCache in the same namespace as our other core asset caches
2012-09-09 14:35:48 -04:00
8321ecb7a2
Revert "Move addin information to CoreModulePlugin.addin.xml"
...
This reverts commit 2ec34580cehttp://opensimulator.org/mantis/view.php?id=6278 .
2012-09-09 13:50:44 -04:00
afb4e06f63
Reduce max concurrent endpoint connections from 50 to 6 (was 2 before)
2012-09-09 17:41:10 +02:00
0556bbefdd
Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM
...
to UUID.Zero because it ties up XMLRPC handlers needlessly.
2012-09-09 16:30:01 +02:00
0d97beefce
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
783ee949ea
implementing per-region configuration of limits on the number of prims one can have in a linkset
...
Applied with changes - patch was based on a repo different from core
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-09 12:59:25 +01:00
d734c1985c
Merge branch 'ubitwork' into avination
2012-09-08 18:03:17 +02:00
a91ca984d5
llClientView: try to have only one thread per client processing
...
RegionHandleRequests. (code assumes packet handle is called async as it is not)
2012-09-08 12:22:40 +01:00
e041f09750
refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
2012-09-08 00:44:27 +01:00
fa3edcf55c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-08 00:17:57 +01:00
874bde366a
4096 is used in various places as the maximum height of a region, refactoring to be a constant
2012-09-08 00:14:39 +01:00
126eae7100
BulletSim: Add Bullet body and shape to BSPhysObject and rename
...
'Body' to 'BSBody' for disambiguation when reading code.
Complete the API2 interface so nearly all methods on bullet
classes are available to the managed code. The efficient
single call simulation step is kept in place while all
other creation/destruction/parameterization can be done
in the managed code.
2012-09-07 16:05:28 -07:00
3c097cb7a9
BulletSim: Add some comments (gasp) and log messages.
2012-09-07 16:05:22 -07:00
189f51233e
BulletSim: PhysicsActorType() now returns the correct value rather than 'unknown'.
2012-09-07 16:05:16 -07:00
76dc29dc37
BulletSim: Modify collision flag calls to return the current flags.
...
Track current collision flags in BSPrim.
Add BulletSimAPI calls for saving and restoring rigidBodies using
construction information structure.
2012-09-07 16:05:11 -07:00
b379e790a2
Set the maximum number of concurrent connections to a service endpoint
...
to 50. This doesn't work on stock mono but it works in Avination and also
under Windoze.
2012-09-07 23:27:40 +02:00
924df14c5e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
717b11856e
Move addin attributes to RegionCombinerModule.addin.xml
...
Will help in automation of setting version info for addin dependencies.
2012-09-07 13:21:06 -04:00
550f6c4ad2
Revert "Move addin information to RegionCombinerModule.addin.xml"
...
This reverts commit ab446bc692
2012-09-07 11:41:47 -04:00
1f18ce516f
Move addin information to RegionCombinerModule.addin.xml
...
Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
2012-09-07 11:07:19 -04:00
2ec34580ce
Move addin information to CoreModulePlugin.addin.xml
...
Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
2012-09-07 10:18:00 -04:00
71d2d327d0
One more redundante ParcelProprieties on login
2012-09-07 12:50:38 +01:00
c83dd021f3
stop sending duplicated parcelProprieties at login
2012-09-07 11:37:51 +01:00
23be1cf1cd
remove fireandforget call to EnableChildAgents at end on CompleteMovement,
...
since this is already on own thread and its at the end of it.
2012-09-07 09:40:28 +01:00
288baaecaf
Add warning chevrons around the GC.Collect added to Warp3DImageModule in commit 5eb2526
...
Manually calling GC.Collect() really shouldnt' be necessary and is generally regarded as a bad idea.
A GC should occur anyway pretty shortly afterwards.
However, can leave this in development code for now to see if it does actually make a significant difference rather than simply doing a GC a little earlier.
2012-09-07 00:46:24 +01:00
d2b00749ef
Add missing DynamicTexture.cs file from last commit
2012-09-06 23:14:48 +01:00
8f02fd926e
If reusing dynamic textures, do not reuse small data length textures that fall below current viewer discard level 2 thresholds.
...
Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache.
This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request.
This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true
This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
2012-09-06 22:12:05 +01:00
4215877b48
adding utility method for getting SceneObjectGroup from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:56 -04:00
d2e79e26d7
adding utility method for getting SceneObjectPart from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:46 -04:00
8fe8fdb0c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 05:19:15 -04:00
5eb2526e88
0006270: Warp3D leaks memory on mono based systems
...
Thanks Hiro Lecker for a patch to reduce memory useage with Warp3D map module
2012-09-06 05:18:08 -04:00
fbfd28a61b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 00:16:40 +01:00
a0d0c9f751
If the GetTexture capability receives a request for a range of data beyond that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable.
...
This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests.
This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size.
I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank.
If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution.
However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
2012-09-06 00:11:47 +01:00
641b08aa78
Enables cast from int to float for MOD* functions;
...
Thanks SignpostMarv!
2012-09-05 09:13:16 -07:00
9ae293881a
Make friend notifies and closing child agents async because both can
...
block the heartbeat thread if the sim being contacted is unresponsive
2012-09-04 22:53:52 +02:00
8a537f8f66
Merge branch 'ubitwork' into avination
2012-09-04 13:02:33 +02:00
c298ae9e75
bug fix
2012-09-04 10:51:43 +01:00
d4fad2ba42
a forgotten file plus minor changes. Imp and SL viewer seem to preserve
...
flight. FS 4.2.2 does not.
2012-09-04 07:32:03 +01:00
e1755e2d71
let avatar keep flying in tps to same region. (still bad for other
...
regions )
2012-09-04 04:56:37 +01:00
3fb2523f5b
Remove debug spam
2012-09-04 03:20:37 +02:00
056e66b3de
Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into
...
it's own sub-method
2012-09-04 03:14:39 +02:00
07dbe46ba3
wrapping attachment functions in a region
2012-09-04 00:03:44 +01:00
ff867b59cf
Implementing functing to send messages directly to attachments
2012-09-04 00:03:44 +01:00
d4b8a13a1d
refactoring the grunt work of MessageObject into a private method with a UUID argument
2012-09-04 00:03:44 +01:00
a858c5daee
implementing a function to get the number of attachments worn
2012-09-04 00:03:43 +01:00
8d431c6359
formatting
2012-09-04 00:03:43 +01:00
663bfbb372
although the attachmentPoint argument is a uint, zero is not a valid attachment point
2012-09-04 00:03:43 +01:00
72d20b794a
Revert "made setting rotation match Second Life"
...
This reverts commit f7b88d1c40
2012-09-03 21:54:02 +01:00
f32c74b2ff
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
2012-09-03 21:53:55 +01:00
574a6e3580
Revert "formatting"
...
This reverts commit fb211c64fd
2012-09-03 21:53:46 +01:00
d297eb39e5
Revert "made setting rotation match Second Life"
...
Second Life seems to have introduced a bug, as we have confirmation that SL
behavior changed recently and changed in contradiction to their stated intention
This appears to be another of the bugs SL is notorious for. Signpost and I have
decided to back this out until SL's intention becomes clear.
This reverts commit f7b88d1c40
2012-09-03 21:52:12 +01:00
29218cdb31
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
2012-09-03 21:52:03 +01:00
359f9efc76
Revert "formatting"
...
This reverts commit fb211c64fd
2012-09-03 21:51:54 +01:00
96b50d28f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-09-03 14:05:18 +01:00
fb211c64fd
formatting
2012-09-03 13:55:41 +01:00
a3d140b57c
no need to assign rotation to a variable now
2012-09-03 13:55:40 +01:00
f7b88d1c40
made setting rotation match Second Life
2012-09-03 13:55:40 +01:00
7cfcca87c6
Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are
...
not yet initialized
2012-09-03 13:25:31 +02:00
e2e8b09059
Merge branch 'master' into careminster
2012-09-02 22:15:55 +01:00
63e6666f22
try to reduce potencial recursive locking
2012-09-01 02:05:28 +01:00
39f5fd0f58
Merge branch 'avination' into ubitwork
2012-08-31 22:30:33 +01:00
ffdc798720
BulletSim: Update BulletSimAPI to match the DLL interface.
...
Major rework of terrain management which finally makes mega-regions work.
Update heightmap of terrain by rebuilding the terrain's body and shape.
There is a problem with just replacing the shape so this workaround
will do for the moment but it will need to be resolved for
mesh and hull switching.
2012-08-31 11:41:33 -07:00
ae852bb873
BulletSim: clean up some variable naming for consistancy.
...
Update DLL API for new terrain and shape/body pattern methods.
Terrain creation and modification uses new shape/body pattern.
Move debug logging callback set to initialization call so logging
is per physics engine.
2012-08-31 11:41:28 -07:00
d3adf9b2b3
BulletSim: fix line endings.
2012-08-31 11:41:23 -07:00
7c140570db
BulletSim: Changes to terrain storage and management so mega-regions work.
...
Moved all terrain code out of BSScene and into new BSTerrainManager.
Added logic to manage multiple terrains for mega-regions.
Added new functions to BulletSimAPI to match the library.
Moved all of the terrain creation and setup logic from C++ code to C# code.
The unused code has not yet been removed from either place. Soon.
Moved checks for avatar above ground and in bounds into BSCharacter.
2012-08-31 11:41:18 -07:00
7b6987ce83
BulletSim: unify physical objects under BSPhysObjects. Now BSScene and BSLinkset only know of BSPhysObject's and there is only one list to search in BSScene.
2012-08-31 11:41:12 -07:00
0376b8ddbc
BulletSim: add new interface for mesh, hull and terrain creation that will move nearly all of the logic into the C# code.
2012-08-31 11:41:07 -07:00
cbdfca1460
Merge branch 'master' into careminster
2012-08-31 15:33:42 +01:00
dac31303b7
Type.Type is RuntimeType
2012-08-31 15:33:15 +01:00
c0feaf54de
Merge branch 'master' into careminster
2012-08-31 14:40:30 +01:00
edd3577b66
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-31 14:34:44 +01:00
054db94d5d
formatting
2012-08-31 14:32:33 +01:00
794c5f5a6d
adding support for static method script invocations
2012-08-31 14:32:33 +01:00
b625579780
moving assignment to new line to make next commit easier to read in diffs
2012-08-31 14:32:33 +01:00
7e41559917
using specific type instead of var
2012-08-31 14:32:33 +01:00
8cd415c2b0
formatting
2012-08-31 14:32:32 +01:00
4c58c1b116
formatting
2012-08-31 14:32:32 +01:00
e6f43023b6
adding support for finding static methods
2012-08-31 14:32:32 +01:00
bcf944db48
assign binding flags to variable
2012-08-31 14:32:32 +01:00
7a9eee8538
no need to assign result to GetMethodInfoFromType
2012-08-31 14:32:32 +01:00
05648c2c4a
changing to use Type argument instead of object
2012-08-31 14:32:31 +01:00
dff746df7b
moving code that will be common into private static method
2012-08-31 14:32:31 +01:00
973f2e8be5
adding documentation to script invokation methods
2012-08-31 14:32:31 +01:00
1b15144208
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-08-31 01:32:18 +01:00
3c019bea8c
Implementing a vastly simpler means of allowing region modules to access GetLinkParts than mantis 6236
2012-08-31 01:19:17 +01:00
68814f904e
Replace SendBannedUserList with Avination's version. Untested in core. Not even test compiled.
2012-08-31 00:37:27 +01:00
fd92560649
Merge branch 'avination' into careminster
2012-08-31 00:34:22 +01:00
3ed0d79b00
Make ReuseDynamicTextures an experimental config setting in [Textures]. Default is false, as before.
...
If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them.
This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable).
Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry).
If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated.
CUrrently experimental. Default is false, as before.
2012-08-30 22:57:40 +01:00
d89b974680
If the compile-time DynamicTextureModule.ReuseTextures flag is set, check metadata still exists for any reused asset in case some other process has removed it from the cache.
2012-08-30 22:28:45 +01:00
a7281003d8
move keyframemotion.copy from sop.copy to sog.copy, where there is
...
newgroup information avaiable.
2012-08-30 01:30:56 +01:00
1eb7d963cf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 00:31:03 +01:00
c821153a4f
[possible still bad] make use of keyframemotion.copy on sop.copy, replacing
...
fromdata(seralize). for now its called with null group since sop.copy()
hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
2012-08-30 00:15:46 +01:00
c76c63725b
fixing bug where last element in list is ignored
2012-08-30 00:10:28 +01:00
6b277394c0
refactoring as the list funcs either skip invalid values or recall ToDoubleList
2012-08-30 00:10:28 +01:00
927cbc6762
Merge branch 'ubitwork' into avination
2012-08-30 00:36:37 +02:00
211f4fb411
Sequence inventory descendents requests to reduce inventory server load and
...
movement lag.
2012-08-30 00:34:12 +02:00
3d736d575f
This partially implements the LSL function to set the response
...
type for an HTTP request. Since the "official" LSL function limits
the use of the response type, it is implemented as osSetContentType
with a string for the content mime type and a threat level of high.
With this function you should be able to implement rather functional
media-on-a-prim application with much less difficulty.
2012-08-29 14:56:51 -07:00
67f18655d5
Allow llList2Key to also act on System.String
2012-08-29 22:06:43 +02:00
f7a60261e9
Merge branch 'ubitwork' into avination
2012-08-29 11:46:57 +02:00
74465df43f
Fix issue with the quit packet being stuck int he queue and a one packet delay.
...
Also fix semaphore excetion caused by enqueueing while dequque is taking place.
2012-08-29 11:45:28 +02:00
34f0694938
Remove Justin's addition to avoid sending incoming packets to inactive clients
...
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
2012-08-29 11:35:21 +02:00
f671e446bf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 11:18:32 +02:00
899337b4a0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
2012-08-29 03:31:13 +01:00
2e54c3cc8f
A few more changes to keyframes
2012-08-29 03:19:47 +01:00
0c3061f973
implementing rule tracking
2012-08-29 02:10:04 +01:00
3bf7bd6359
track originating IScriptApi method for SL-like error messages. Will add rule number tracking in next commit.
2012-08-29 02:10:04 +01:00
7ea832d47c
Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders.
...
This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder.
Added regression test for this case.
Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService
Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used
since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs.
However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
2012-08-29 02:01:43 +01:00
72ac0665b2
[Potentially broken] keyframes changes.. since it's there, use timer for
...
crossing retries and not still another thread, etc...
2012-08-29 00:35:06 +01:00
c1cece4b82
Add experimental DynamicTextureModule.ReuseTextures flag, currently only configurable on compile.
...
Disabled (status quo) by default.
This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours.
This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web).
This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures.
A downside is that this stops expiry of old temporary dynamic textures from the cache,
Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours.
2012-08-28 23:06:53 +01:00
378a79e7cc
Add a queue with two priority levels. This is a drop in replacement for
...
the BlockingQueue from OMV, but allows two priorities.
2012-08-28 22:17:17 +02:00
5284e514d5
Fix a nullref while object is being created
2012-08-28 22:16:01 +02:00
aa44df9c04
Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.
2012-08-28 20:35:17 +01:00
ef6e007a4c
[possible still very broken] mess around keyframes. timer events
...
threads overlaps, some null objects exceptions, region crossing...
2012-08-28 03:21:03 +01:00
1e18f0f26a
copying documentation from http://opensimulator.org/wiki/Threat_level
2012-08-28 00:12:35 +01:00
e916b1399f
formatting
2012-08-27 23:39:18 +01:00
72c2d13ac6
refactoring to load from self (fixes ChanneDigger being absent)
2012-08-27 23:39:18 +01:00
a6d689c529
refactoring to assign the first argument to a variable
2012-08-27 23:39:18 +01:00
ab9bfe5156
minor: Simplify return of vector render module name and some very minor removal of unncessary syntax clutter
2012-08-27 23:06:37 +01:00
4e26d039d6
Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams()
2012-08-27 23:03:21 +01:00
3082fdd0f6
Add VectorRenderModuleTests.TestRepeatDrawContainingImage()
2012-08-27 22:58:20 +01:00
e90168c738
Add VectorRenderModuleTests.TestRepeatDraw()
2012-08-27 22:42:40 +01:00
b1d0fab954
fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal
...
DataFormat enum, using values from the KFM constants
2012-08-26 20:33:45 +01:00
d76ff560d4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 23:36:33 +01:00
bfa22e2f52
Make llCollisionSprite not throw anymore
2012-08-25 23:49:37 +02:00
bc4bda4441
Minor formatting cleanup
2012-08-25 21:08:33 +01:00
3d8f393fbe
refactoring to local variable for cleaner code
2012-08-25 21:04:43 +01:00
86d4e45f4d
since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 21:03:47 +01:00
681066050c
Also move the other avatar based overload out of harms way
2012-08-25 18:32:59 +01:00
5f1021faa6
Temprary restructure to avoid conflicts
2012-08-25 18:28:05 +01:00
af6b242071
use SceneObjectPart instead of var
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 18:24:52 +01:00
1eb1c1bd4b
renaming to be similar to equivalent Set command
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
2012-08-25 18:19:51 +01:00
007a45aa76
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
2012-08-25 18:08:10 +01:00
6e86b23012
implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams
2012-08-25 02:30:23 +01:00
58714b0aca
minor formatting
2012-08-25 02:30:23 +01:00
5203665bb2
refactoring to local variable for cleaner code
2012-08-25 02:30:23 +01:00
2a2e120470
since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param
2012-08-25 02:30:23 +01:00
a8044999fb
use SceneObjectPart instead of var
2012-08-25 02:30:23 +01:00
3d504261b0
renaming to be similar to equivalent Set command
2012-08-25 02:30:23 +01:00
e04047152f
minor: Fix bad log message for failure to create an inventory folder
2012-08-25 00:49:38 +01:00
f3a5e3a02b
Log initial script startup info notice when xengine actually starts to do this for debugging purposes, rather than before it actually starts to do this.
2012-08-25 00:42:32 +01:00
ba58331b29
Extend "Restarting scripts in attachments" debug log message to show actual name of user and the region they are in
2012-08-24 22:56:05 +01:00
f1a71f544b
Merge branch 'ubitwork' into avination
2012-08-24 23:53:14 +02:00
6d48dbf8ca
Remove debug spam
2012-08-24 23:49:31 +02:00
7e17f4296e
Fix background inventory loading (Viewer 3) so it won't lag out the sim
2012-08-24 23:48:01 +02:00
476996bee8
If a connecting scene presence is replacing an existing scene presence then bypass close checks.
2012-08-24 22:38:07 +01:00
01771aca40
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-24 21:38:46 +01:00
cd325fdf02
Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down into the 3-parameter AddNewSceneObject() method instead of always hardcoding true.
...
This doesn't affect any core OpenSimulator code since all callers were passing true anyway
But it allows region modules to create objects that are never persisted.
2012-08-24 21:36:20 +01:00
67477290ad
stripping superfluous whitespace
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-24 17:44:35 +01:00
582a256646
immediately returning the string.Join operation instead of checking if the list has members
2012-08-24 17:44:14 +01:00
d188272462
refactoring using List.ConvertAll<string>
2012-08-24 17:44:14 +01:00
7cdb564fdd
Merge branch 'master' into careminster
2012-08-24 01:22:44 +01:00
82b23f7cc1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-24 01:20:23 +01:00
a08687aef3
Revert "implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject()"
...
This reverts commit 2ad9d656b3
2012-08-24 01:18:35 +01:00
2ad9d656b3
implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject()
2012-08-24 00:21:42 +01:00
1747030d19
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-24 00:16:58 +01:00
c557684666
Fix bad child prim permissions that can make objects change perms after rezzing
...
Port from Avination
2012-08-24 00:15:30 +01:00
a3cbda0d74
Removed land checking as suggested by SignpostMarv.
...
Now whatever remaining health the avatar has is displayed (float).
This will be 100% (100.000000) if no damage has occurred (as what the viewer should really be seeing anyway).
Returns -1.000000 if the avatar is not found.
2012-08-24 00:13:27 +01:00
4f3fabae5b
Adds osGetHealth.
...
Returns the amount of health (in an integer) that an avatar has left in the scene.
If an avatar is not found or safe is enabled on a region, -1 is returned.
Example usage:
default
{
touch_end(integer _t)
{
key agentID = llDetectedKey(0);
osCauseDamage(agentID, 50);
llSay(0, llKey2Name(agentID) + " has " + (string)osGetHealth(agentID) + "% health left.");
}
}
2012-08-24 00:13:14 +01:00
7fca69222b
Merge branch 'avination' into careminster
2012-08-24 00:07:56 +01:00
783773a0c0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-24 00:07:17 +01:00
aede42b875
If a script state save fails for some reason on shutdown/region removal, get xengine to spit out some useful information and continue to save other script states
2012-08-23 23:13:53 +01:00
c1a0c7fad1
Fix bad child prim permissions that can make objects change perms after rezzing
2012-08-23 23:09:32 +02:00
UbitUmarov