Justin Clark-Casey (justincc)
5f2a65c976
refactor: Eliminate unnecessary duplicate avCapsuleTilted
2012-03-20 20:28:58 +00:00
UbitUmarov
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
Melanie
70c0d6cf0b
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-20 18:07:24 +01:00
Melanie
7f7801ecb9
Cover the case where prims are loaded and ParentGroup is not yet set
2012-03-20 18:02:43 +01:00
UbitUmarov
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
Melanie
f2d17433bb
Cause prims to be saved if extra physics parameters are changed
2012-03-20 12:34:06 +01:00
Melanie
abd9957198
Fix an invalid cast that only showed at runtime
2012-03-20 12:24:42 +01:00
Melanie
7779b1eabc
Store and reload extra physics from database
2012-03-20 12:04:55 +01:00
Melanie
5768a151ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
2012-03-20 02:48:11 +00:00
Justin Clark-Casey (justincc)
a3abd65e3d
Remove pointless ThreadAbortException catching in a test that isn't run anyway.
2012-03-20 01:41:32 +00:00
Justin Clark-Casey (justincc)
8c911ddaf0
Remove some pointless catching/throwing in the scene loop.
2012-03-20 01:39:19 +00:00
Justin Clark-Casey (justincc)
4cbaf053cf
Fix small typo
2012-03-20 00:53:33 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e9271ec653
Add some doc about the EventManager.OnLoginsEnabled event.
2012-03-19 22:48:26 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
618244f285
Remove debug output using Console.WriteLine and trim excessive whitespace
2012-03-19 14:39:19 +01:00
Melanie
808995fb68
Merge branch 'ubitwork'
2012-03-19 14:25:11 +01:00
Justin Clark-Casey (justincc)
4972491efb
Move startup/shutdown command .txt files to .txt.example files to avoid clobbering on updates.
...
Thanks to Whitestar in http://opensimulator.org/mantis/view.php?id=5938 for pointing out this problem.
2012-03-19 00:29:02 +00:00
Justin Clark-Casey (justincc)
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
. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files.
This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places).
Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
2012-03-19 00:18:04 +00:00
Melanie
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
Diva Canto
d1256536b5
Added GetUUID(first, last) on UserAgentsService so that we can finally make direct user connections.
2012-03-17 21:27:28 -07:00
Diva Canto
441ef301a3
Amend to previous commit: normalize strings ToLower.
2012-03-17 19:41:47 -07:00
Diva Canto
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
Diva Canto
92b1ade78e
BAD JUSTIN!
...
People using standalone in master, please update your StandaloneCommon.ini according to this change.
People using robust in master, please update your Robust.HG.ini.example[.HG].ini according to this change.
2012-03-17 15:01:10 -07:00
Diva Canto
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
Diva Canto
d87a5758fb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-17 10:00:43 -07:00
Diva Canto
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
UbitUmarov
41a0c850f8
added a new UbitMeshing module so i can mess it...
2012-03-17 09:27:56 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
1e4180fc93
Clean up "save iar" help
2012-03-17 02:54:19 +00:00
Diva Canto
a4dca88a57
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-16 13:08:27 -07:00
Diva Canto
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
UbitUmarov
ae8e089b9c
some more work on costs
2012-03-16 15:33:49 +00:00
Justin Clark-Casey (justincc)
59b6f6a6e0
minor: reuse threadpool count we just fetched instead of fetching it again
2012-03-16 03:56:56 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
9497a7c7bd
refactor: separate out console and status report generation parts of XEngine
2012-03-16 03:32:14 +00:00
Justin Clark-Casey (justincc)
922d8c9312
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-16 03:28:17 +00:00
Justin Clark-Casey (justincc)
6e8f80f1ab
Improve threadpool reporting to "show threads" console command (also gets printed out periodically)
2012-03-16 03:26:47 +00:00
Diva Canto
05bb2e4275
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 20:22:59 -07:00
Diva Canto
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
78e992dbd0
Move startup_commands.txt.example to startup_commands.txt for consistency with the existing shutdown_commands.txt.
...
Add comments to both files saying what they are (files that can contain console commands to execute on sim startup/shutdown) with an example.
2012-03-16 02:13:45 +00:00
Justin Clark-Casey (justincc)
b19be657b6
Remove unnecessary "backup" command in shutdown_commands.txt
...
The simulator is already doing this internally.
2012-03-16 02:10:59 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
34f6f87b6c
Remove unused bin/ScriptEngines/Default.lsl
...
It would certainly be nice to change the default script on disk, but this is currently unused and isn't a suitable default.
At this location it would also stop an easy manual deletion of script engine compiles and state.
2012-03-16 01:51:16 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
7df4a544fe
Fix owner name display in "Top Colliders" and "Top Script" region reports.
2012-03-16 00:53:36 +00:00
Justin Clark-Casey (justincc)
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