4ee8b3e23e
Fix build break
2012-03-23 01:11:43 +00:00
a9995ede65
Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e
...
Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.
2012-03-23 01:08:13 +00:00
bc2963d42a
Comment out unused scene loop restart code.
...
This has actually been unused since at least 0.7.2 due to earlier changes.
2012-03-23 01:03:10 +00:00
08b8ebcc7e
Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpdate is no longer properly updated and is redundant anyway.
2012-03-23 00:55:11 +00:00
c903813e00
RegionReady logging
...
Some maintenance to clean up logging messages
2012-03-22 20:49:45 -04:00
40b9b519b8
Add commented out section on collisions switch in Scene.SetSceneCoreDebug().
...
This was not implemented before the recent changes but should be at some point.
2012-03-23 00:12:14 +00:00
efe61b2481
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-22 17:04:06 -07:00
15c2499ccd
Comment out login parameters debug output accidentally included with c4b2d24
2012-03-22 23:31:41 +00:00
c1d064e1ca
Comment out a terrain save-tile debugging message that accidentally crept in with c4b2d24
2012-03-22 23:16:52 +00:00
ed67b698d3
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-03-22 23:05:58 +00:00
9edf99703a
Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster
2012-03-22 23:01:50 +00:00
5bf45b9b98
refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in MoveTaskInventoryItem()
2012-03-22 22:40:38 +00:00
760010d6fb
Fix llGiveInventory() so that it checks the destination part for AllowInventoryDrop, not the source.
...
This allows llAllowInventoryDrop() to work.
Regression test added for this case.
2012-03-22 22:33:37 +00:00
3bcf71c647
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 22:33:16 +00:00
c4b2d24f33
Add llGiveInventory() test from object to object where both objects are owned by the same user.
2012-03-22 22:17:07 +00:00
df624c13c9
HG Friends: don't notify if the server isn't there.
2012-03-22 15:08:57 -07:00
53b4551b58
Fix merge issue from core
2012-03-22 20:48:31 +00:00
6bc1ccf234
Change a false false to be truly true - or is this statement false?
...
Fixes perms boo-boo
2012-03-22 20:39:18 +00:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
b5d0bc2488
Rework Diva's patch to simplify it
2012-03-22 20:25:20 +00:00
45b588cf00
Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."
...
This reverts commit 6146e7ef25
2012-03-22 20:10:38 +00:00
6146e7ef25
Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
2012-03-22 12:57:12 -07:00
9949ac2f9f
refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity since non-default animations are handled completely separately from this class
2012-03-22 00:10:41 +00:00
71ec84d77f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 00:00:05 +00:00
1a8769e6ef
Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead.
...
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
2012-03-21 23:57:39 +00:00
7783c93802
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-21 16:16:47 -07:00
cb2727cf6e
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-21 16:16:46 -07:00
6c55fd93a3
BulletSim: set buoyancy in only one place
2012-03-21 16:16:45 -07:00
898a16802b
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-21 16:16:44 -07:00
eafc3d6c47
BulletSim: Update list of TODO tasks
2012-03-21 16:16:41 -07:00
8652f277df
Revert "Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out."
...
This reverts commit 68981d01f0
2012-03-21 22:45:34 +01:00
68981d01f0
Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out.
2012-03-21 21:19:29 +00:00
4f593fa8c3
minor clean
2012-03-21 21:17:00 +00:00
5170cd7577
Updated the UserAccountsClient a little bit, plus some more sanity checks on the service connector.
2012-03-21 11:22:39 -07:00
4a9ca3ca8f
HG Friends: reroute the status notifications to the HGFriends service, so that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
2012-03-21 10:35:06 -07:00
d8bcb78b10
HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that we can better manage this traffic.
2012-03-21 09:14:17 -07:00
68736aa460
fix a bad reset of shapetype on pbshape change, added missing checksculpload ( to reload mesh on change )
2012-03-21 15:27:33 +00:00
8ad426f329
Removed extraneous debug message
2012-03-21 08:08:43 -07:00
1089e9b842
Removed extraneous debug message
2012-03-21 08:08:12 -07:00
a03c55fee7
missed a creatMesh in chODE. temporary removed m_meshfailed test since it may colide with how meshs and sculpts are loaded. This needs a good revision..
2012-03-21 14:03:50 +00:00
316f272b62
shapetype support on chOde so it can also request a simple convex hull 'mesh'
2012-03-21 12:57:46 +00:00
5abe1b4fce
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 21:36:46 -07:00
d49dd5573b
Removed extraneous debug messages. Added a check for UUID.Zero.
2012-03-20 21:36:02 -07:00
312f0c6970
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-21 02:45:33 +00:00
f6cbafcaf0
Changes of PrimShapeType should now work with UbitOde ( almost untested )
2012-03-21 02:39:16 +00:00
54a8a5baba
If "debug scene updates true" then print out to log when a garbage collection occurs.
2012-03-21 02:02:14 +00:00
11ed932263
Tell physics about physics shape when creating. Added some virtual methods to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc )
2012-03-21 01:46:41 +00:00
de53aa32e0
Add Scene.DebugUpdates switch which, if turned on, will print out a warning when a frame updates takes longer than twice the desired time
...
This is controlled via "debug scene updates true|false" on the region console.
Also fix an oversight with "debug scene teleport true|false"
2012-03-21 01:27:09 +00:00
2e41294da9
add convex state to mesh key, so a change is detected.
2012-03-21 01:24:30 +00:00
ab243f4a57
Incorporate scene teleporting debugging into "debug scene teleport true|false" command
2012-03-21 01:13:44 +00:00
9671e43497
Replace "scene debug true false true" console command with "scene debug scripting true" or other parameters as appropriate.
...
This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
2012-03-21 01:02:58 +00:00
ee9210f656
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-21 00:26:02 +00:00
7a0d7be44c
Refix the fixed fix!
2012-03-21 00:17:58 +00:00
69a9a6993e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 17:33:26 -07:00
91a001d3cf
fix compile error from last commit
2012-03-21 00:31:31 +00:00
9e8b194356
Fixed borkness with map search introduce by my last changes to it.
2012-03-20 17:29:34 -07:00
742acc0a3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 17:26:18 -07:00
f7c61790b7
Fixed borkness with previous merge.
2012-03-20 17:25:52 -07:00
022366a074
refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()
2012-03-21 00:23:46 +00:00
841b4232f6
Line endings
2012-03-20 17:19:55 -07:00
3fa51f66ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Framework/Util.cs
2012-03-20 17:19:14 -07:00
d08ad6459a
HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
2012-03-20 17:14:19 -07:00
d3a5cdd7c2
Merge branch 'master' into careminster
2012-03-21 00:09:18 +00:00
250b75f03b
Merge branch 'master' into careminster
2012-03-21 00:03:03 +00:00
7bf628ab31
Add ability to log warn if a frame takes longer than twice the expected time. Currently commented out.
2012-03-21 00:02:08 +00:00
117a862769
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-21 00:01:11 +00:00
5233e335e9
Move the health monitoring stuff where it will do some good
2012-03-21 00:00:32 +00:00
80a3b43e69
Merge branch 'master' into careminster
2012-03-20 23:59:49 +00:00
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
4c41b53a4b
Add prim name to "[MESH]: No recognized physics mesh..." log message
2012-03-20 23:35:50 +00:00
02f9caf6ce
remove some mono compiler warnings
2012-03-20 23:34:10 +00:00
3701f893d3
remove unnecessary tmpFrameMS, use maintc instead for frame time calculation
2012-03-20 23:31:57 +00:00
c39fba8f9d
minor: remove some mono compiler warnings
2012-03-20 23:19:11 +00:00
8bdd38b804
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 23:14:15 +00:00
30b2a8c778
Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.
...
Update() now accepts a frames parameter which can control the number of frames updated.
-1 will update until shutdown.
The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
2012-03-20 23:12:21 +00:00
3d258d2688
Merge branch 'ubitwork'
2012-03-20 23:09:34 +01:00
8817b6e74c
let convex be a parameter to createMesh so it can be used. Was forced to add it also to original mesher code and zeromesher
2012-03-21 00:02:41 +00:00
23e6a31aa5
added convex decomposition hulls support. Hardcoded to use mesh or this. (so no simple hull of convex prims for now).
2012-03-20 23:38:04 +00:00
bd1f848bf6
slight increase in jump power to make running jump slightly better.
2012-03-20 14:17:15 -07:00
fdd4d787a4
Merge branch 'master' into careminster
2012-03-20 20:48:55 +00:00
9ed3532c1b
reduce avatar verticle jump from the absurd 5 meter jump to a less
...
absurd 3m vertical jump to better match what you would see in Second
Life and be more in line with what users would expect.
2012-03-20 13:45:38 -07:00
86bd287b53
refactor: precalculate the fixed movement factor for avatar tilting (sqrt(2)) rather than doing it multiple times on every move.
2012-03-20 20:39:33 +00:00
5f2a65c976
refactor: Eliminate unnecessary duplicate avCapsuleTilted
2012-03-20 20:28:58 +00:00
8c1550b58e
WORK in progress!! Now it reads the simple hull shape to use if convex shape is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer"
2012-03-20 19:24:45 +00:00
70c0d6cf0b
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-20 18:07:24 +01:00
7f7801ecb9
Cover the case where prims are loaded and ParentGroup is not yet set
2012-03-20 18:02:43 +01:00
efd7ff3146
add some more notifications about changes on physical parameters ( still incomple and there should be a better away )
2012-03-20 16:46:16 +00:00
f2d17433bb
Cause prims to be saved if extra physics parameters are changed
2012-03-20 12:34:06 +01:00
abd9957198
Fix an invalid cast that only showed at runtime
2012-03-20 12:24:42 +01:00
7779b1eabc
Store and reload extra physics from database
2012-03-20 12:04:55 +01:00
5768a151ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
2012-03-20 02:48:11 +00:00
a3abd65e3d
Remove pointless ThreadAbortException catching in a test that isn't run anyway.
2012-03-20 01:41:32 +00:00
8c911ddaf0
Remove some pointless catching/throwing in the scene loop.
2012-03-20 01:39:19 +00:00
4cbaf053cf
Fix small typo
2012-03-20 00:53:33 +00:00
1c0f3a1f21
Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at the same time.
...
Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time.
2012-03-20 00:40:03 +00:00
e9271ec653
Add some doc about the EventManager.OnLoginsEnabled event.
2012-03-19 22:48:26 +00:00
e2b1c569da
Fix a bug where logins to standalones would fail if the RegionReady module was not active
...
Unfortunately, the OnLoginsEnabled event is currently only guaranteed to fire if the RegionReady module is active.
However, we can instantiate the AuthorizationService in the module RegionLoaded method since by this time all other modules will have been loaded
2012-03-19 22:45:03 +00:00
437f18bc41
Stop console command "xengine status" throwing an exception if there are no scripts in a region.
...
Addresses http://opensimulator.org/mantis/view.php?id=5940
2012-03-19 21:43:23 +00:00
618244f285
Remove debug output using Console.WriteLine and trim excessive whitespace
2012-03-19 14:39:19 +01:00
808995fb68
Merge branch 'ubitwork'
2012-03-19 14:25:11 +01:00
ab54ce1907
Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.
...
The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up.
This replaces the changes in 92b1ade
2012-03-19 00:18:04 +00:00
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
d1256536b5
Added GetUUID(first, last) on UserAgentsService so that we can finally make direct user connections.
2012-03-17 21:27:28 -07:00
441ef301a3
Amend to previous commit: normalize strings ToLower.
2012-03-17 19:41:47 -07:00
7dfa0309c6
More on HG access control. This commit splits the UserManagementModule into the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.
2012-03-17 15:36:20 -07:00
1a4fdd2666
Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the UserManagementModule where it belongs. No functional changes.
2012-03-17 10:48:22 -07:00
d87a5758fb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-17 10:00:43 -07:00
33c14cb107
Region access control! Region operators can now specify things like DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.
2012-03-17 10:00:11 -07:00
41a0c850f8
added a new UbitMeshing module so i can mess it...
2012-03-17 09:27:56 +00:00
4a57112f19
Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927
...
This allows one to get description data for a given prim inventory item.
Thanks MarcelEdward and GuduleLapointe!
2012-03-17 04:02:23 +00:00
1e4180fc93
Clean up "save iar" help
2012-03-17 02:54:19 +00:00
a4dca88a57
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-16 13:08:27 -07:00
a2009ffe2e
Terrain: added [Terrain] section with an option to load an initial flat terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
2012-03-16 13:08:05 -07:00
ae8e089b9c
some more work on costs
2012-03-16 15:33:49 +00:00
59b6f6a6e0
minor: reuse threadpool count we just fetched instead of fetching it again
2012-03-16 03:56:56 +00:00
bece2023e7
Add total scripts count to "show threads"
...
However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
2012-03-16 03:52:13 +00:00
9497a7c7bd
refactor: separate out console and status report generation parts of XEngine
2012-03-16 03:32:14 +00:00
922d8c9312
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-16 03:28:17 +00:00
6e8f80f1ab
Improve threadpool reporting to "show threads" console command (also gets printed out periodically)
2012-03-16 03:26:47 +00:00
05bb2e4275
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 20:22:59 -07:00
05a1493fff
More on map search: send extra messages to the user regarding the region being found or not, because the UI is horribly confusing -- places profile is always "loading..." whether the region exists or not.
2012-03-15 20:22:26 -07:00
421b562a04
Add process working memory to "show stats" memory statistics.
...
This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
2012-03-16 02:43:33 +00:00
aa881e8065
Allow comments to appear in command scripts (e.g. shutdown_commands.txt).
...
These can start with ; # or //
2012-03-16 02:07:26 +00:00
8550a4a07e
In Top Scripts report, don't show scripts with no or less than 1 microsecond of execution time.
...
This is to make the report clearer and less confusing.
2012-03-16 01:46:21 +00:00
c386b68373
Aggregate script execution times by linksets rather than individual prims.
...
This is for the top scripts report.
2012-03-16 01:31:53 +00:00
7df4a544fe
Fix owner name display in "Top Colliders" and "Top Script" region reports.
2012-03-16 00:53:36 +00:00
a4b01ef38a
Replace script-lines-per-second with the script execution time scaled by its measurement period and an idealised frame time.
...
The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute.
Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100.
The actual measurement value should be script execution time per frame but XEngine does not work this way.
Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time.
This is still not ideal but gives reasonable results and allows scripts to be compared.
This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
2012-03-16 00:34:30 +00:00
0548eeb571
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 16:03:33 -07:00
18d1d6d3b4
More on SLURLs and V3. This is hacky, but it works. Basically, we have to redefine the encoding of HG URLs because the viewer messes them up. Examples of what works and doesn't work:
...
- secondlife://ucigrid00.nacs.uci.edu|8002/128/128 <-- works throughout the viewer
- secondlife://http|!!ucigrid00.nacs.uci.edu|8002+Test+Zone+1/128/128 <-- works throughout the viewer
- secondlife://http|!!grid.sciencesim.com!grid!hypergrid.php+Yellowstone01+74/128/128 <-- works throughout
- secondlife://http%3A%2F%2Fucigrid00.nacs.uci.edu%3A8002%20UCI%20Central%201/128/128 <-- works in chat, but not as URLs in the webkit
2012-03-15 16:03:09 -07:00
df144eb9e2
Revert "Revert "More hacking around viewer bug""
...
This reverts commit e5612553ce
2012-03-15 14:55:25 -07:00
f52917288a
These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, needed.
...
Revert "Revert "Hack around https://jira.secondlife.com/browse/VWR-28570 ""
This reverts commit 5a9560db28
2012-03-15 14:54:25 -07:00
5a9560db28
Revert "Hack around https://jira.secondlife.com/browse/VWR-28570 "
...
This reverts commit 697ac7fd9d
2012-03-15 14:36:48 -07:00
e5612553ce
Revert "More hacking around viewer bug"
...
This reverts commit 10731732b4
2012-03-15 14:36:29 -07:00
8b5298a62e
Protect the scriptmodulecomms interface.
2012-03-15 13:37:43 -07:00
402ff75d78
Adds a new script command 'modInvoke' to invoke registered functions
...
from region modules. The LSL translator is extended to generate the
modInvoke format of commands for directly inlined function calls.
A region module can register a function Test() with the name "Test".
LSL code can call that function as "Test()". The compiler will translate
that invocation into modInvoke("Test", ...)
2012-03-15 13:16:02 -07:00
fd4ad82367
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 11:06:08 -07:00
10731732b4
More hacking around viewer bug
2012-03-15 11:05:43 -07:00
697ac7fd9d
Hack around https://jira.secondlife.com/browse/VWR-28570
2012-03-15 10:17:02 -07:00
b4adf652e7
Merge branch 'ubitwork'
2012-03-15 10:24:40 +01:00
897dc5e77e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-15 10:55:44 +00:00
15ad5f492b
Playing with object costs CAPS ...
2012-03-15 10:25:18 +00:00
051ea18a4f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-15 04:20:19 +00:00
84ca09f7c5
added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change...
2012-03-15 02:24:13 +00:00
acb1355ff2
Remove property/field duplication in ScriptInstance where it's unnecessary.
2012-03-15 02:02:31 +00:00
2d32401e23
Simplify some logic in the ScriptInstance constructor - running is set to false in both if/else branches
2012-03-15 01:32:16 +00:00
f0c1746063
minor: correct indentation levels
2012-03-15 01:26:38 +00:00
5ddda89238
Remove duplication of m_RunEvents and Running
2012-03-15 00:48:44 +00:00
2f81e53f63
Fix a problem where multiple near simultaneous calls to llDie() from multiple scripts in the same linkset can cause unnecessary thread aborts.
...
The first llDie() could lock Scene.m_deleting_scene_object.
The second llDie() would then wait at this lock.
The first llDie() would go on to remove the second script but always abort it since the second script's WorkItem would not go away.
Easiest solution here is to remove the m_deleting_scene_object since it's no longer justified - we no longer lock m_parts but take a copy instead.
This also requires an adjustment in XEngine.OnRemoveScript not to use instance.ObjectID instead when firing the OnObjectRemoved event.
2012-03-15 00:20:47 +00:00
12cebb12d5
Alleviate an issue where calling Thread.Abort() on script WorkItems can fail to release locks, resulting in a crippled simulator.
...
This seems to be a particular problem with ReaderWriterLockSlim, though other locks can be affected as well.
It has been seen to happen when llDie() is called in a linkset running more than one script.
Alleviation here means supplying a ScriptInstance.Stop() timeout of 1000ms rather than 0ms, to give events a chance to complete.
Also, we check the IsRunning status at the top of the ScriptInstance.EventProcessor() so that another event doesn't start in the mean time.
Ultimately, a better solution may have to be found since a long-running event would still exceed the timeout and be aborted.
2012-03-15 00:06:52 +00:00
cf9ebd301c
bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
2012-03-14 18:24:04 +00:00
d1daea0108
Allow llTeleportAgent to teleport gods when not in god mode
2012-03-14 19:21:25 +01:00
c0f70d17fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-14 11:33:51 +00:00
d6dd3c42d1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 20:16:19 -07:00
479dd65a63
Teleports: bounce off repeated requests of teleporting the same agent. Some scripts do that, and that fails the whole thing.
2012-03-13 20:15:38 -07:00
5a09572393
Minor sanity check on simulation agent handler (content type)
2012-03-13 20:14:51 -07:00
95ec96bf86
refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event)
...
Also add other various illustrative comments
2012-03-14 00:29:36 +00:00
8388182707
Implement llSetPrimitiveParams for physics shape and material. Add
...
llSetPhysicsMaterial support.
2012-03-13 22:20:12 +01:00
d4e6834f99
Hook up the new cap to the SOP changes
2012-03-13 20:49:16 +01:00
f53c322b7e
Merge branch 'ubitwork'
2012-03-13 20:21:26 +01:00
577d07aa44
missed commit of extraphysics parameters serialization..
2012-03-13 19:51:41 +00:00
741badc4fa
let PhysicsShapeType none remove physics remove physics on child parts **UnTested**
2012-03-13 19:24:41 +00:00
bf2a5508de
bug fix
2012-03-13 19:17:32 +00:00
f415eb84e1
Implement the cap to send extra physics params to the viewer. Not functional
...
yet because the parameters are not actually stored anywhere yet.
2012-03-13 20:06:39 +01:00
923db53975
let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy with it disabled...
2012-03-13 18:10:43 +00:00
5086fe9176
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-13 18:00:27 +00:00
3de3b9e63c
initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
2012-03-13 17:56:32 +00:00
37828c9b9a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 08:07:11 -07:00
4eb2605c79
Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want.
2012-03-13 08:06:30 -07:00
22e0cc09ac
Ensure child prims of a phantom prim are marked as phantom
2012-03-13 13:12:14 +01:00
ebcd4910a2
Refactor, move OjectChangeData into it's own file and rename
...
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
2012-03-13 13:08:32 +01:00
25592bbd85
Add max thread and min thread information to "xengine status" region console command
2012-03-12 21:16:05 +00:00
e0dd38f672
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
...
.NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5
and before, WebUtil defined an extension method for Stream with the signature
Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter
is different in the two forms and depending on which compiler and/or
runtime you use, you could get one form or the other. Crashes ensue.
This change renames the WebUtil stream copy method to something that
cannot be confused with the new CopyTo method defined in .NET 4.0.
2012-03-12 10:07:04 -07:00
13fb582c12
DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the capitalization of 'name' to lower case, also in the same <grid> section.
2012-03-12 07:55:17 -07:00
edc8a15487
Restore duplication of the SL bug where linking phantom to solid lets the
...
child prim remain phantom
2012-03-12 14:06:39 +01:00
bfd38ecad4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 11:45:38 +01:00
139c0665cf
Add AVATAR_MALE flag to return values of llGetAgentInfo
2012-03-12 11:44:07 +01:00
a35e00e81e
allocate UndoRedoStore only on demand
2012-03-12 07:50:14 +00:00
b5e172677d
ubitode prim select was not doing phantom case
2012-03-12 07:46:20 +00:00
6c4c500ee4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 06:58:38 +00:00
2a17dafa04
missing file in ubitODE
2012-03-12 06:52:03 +00:00
44ce068d6c
Allow RLV to redirect received folders to #RLV folder
2012-03-11 18:21:47 +01:00
925295f3ab
ubitOde also knows a bit more about physical phantom
2012-03-11 12:33:59 +00:00
7832889437
Physical phantoms testable with chOde. Volume detection was changed and also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED ***
2012-03-11 11:01:38 +00:00
dab7e03584
bug fix (??) in sog copy()
2012-03-11 08:43:53 +00:00
43dc0ee020
more phantom physics ( chODE and a fix in manager physicsactor
2012-03-11 07:44:34 +00:00
21a76a619f
initial steps to support physical phantoms
2012-03-11 06:32:06 +00:00
b0f01cec98
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 03:57:59 +00:00
824eb7ed20
Added osGetGridGatekeeperURI()
2012-03-10 19:51:28 -08:00
1f7c0c2ea0
cleanup + comments
2012-03-11 03:28:17 +00:00
53bda83cc2
cleanup + comments
2012-03-11 03:14:15 +00:00
80160c128d
coments change..
2012-03-11 02:58:56 +00:00
dba0d79833
minor changes on updates control on doChangeObject(..)
2012-03-11 02:55:39 +00:00
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
e4e6f781a6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 00:53:53 +00:00
0a4056ad22
Merge branch 'ubitwork'
2012-03-11 01:47:36 +01:00
ab235abc46
Changed undo redo internals. moved exec code to UndoState.cs from sop that now only sees a unified UndoRedoStore class, added size limit on buffers so only last 5 undo/redo are kept. (5 is hardcode like it was ) ***UNTESTED***
2012-03-11 00:36:34 +00:00
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
2012-03-10 20:32:19 +00:00
291dc39691
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-10 08:09:43 -08:00
05e821c444
Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thread.
...
This was previous behaviour anyway.
2012-03-10 03:11:28 +00:00
Justin Clark-Casey (justincc)