Melanie
edb3a9596b
Remove a superfluous newline from help
2012-11-23 03:31:44 +01:00
Melanie
01f06b90dd
Merge branch 'careminster' into avination
2012-11-23 03:42:04 +00:00
Melanie
ae8733bf59
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-23 03:39:49 +00:00
Justin Clark-Casey (justincc)
36c6edac69
Remove the redundant BypassPermissions() checks in EstateManagmentModule.
...
This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
2012-11-23 03:29:50 +00:00
Justin Clark-Casey (justincc)
9b60c14bb1
minor: Add some console feedback on region restart and log who requested a region restart if done from the viewer.
2012-11-23 03:05:30 +00:00
Justin Clark-Casey (justincc)
8c8c8a00a4
Fix problem where restarting the currently selected region would stop various console commands (e.g. "show users") from working.
...
This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
2012-11-23 02:22:30 +00:00
Melanie
6581097001
Fix new command console code to match the output of the original while keeping
...
the new features
2012-11-23 03:20:15 +01:00
Melanie
c96729b55d
Add a newline before the constant help text
2012-11-23 02:06:05 +00:00
Justin Clark-Casey (justincc)
049987925d
Add regression test for checking scene close when SceneManager is asked to close
2012-11-23 02:05:30 +00:00
Melanie
2e7b72d3da
Revert help to display a full command list. Leave the help categories in as
...
"help categories" in case it turns out useful in the future. May not work.
2012-11-23 02:04:24 +00:00
Melanie
b09fb01571
Fix a build break introduced by us having a more efficient DoubleDictionary
...
where core has a simple list
2012-11-23 02:03:44 +00:00
Justin Clark-Casey (justincc)
eb1921ff93
Add "help all" console command which will list all commands alphabetically in a single list
2012-11-23 01:52:48 +00:00
Melanie
2abddedc34
Merge branch 'master' into careminster
2012-11-23 01:49:25 +00:00
Melanie
442896cb1d
Remove duplicate registration of the help topics for the module commander
2012-11-23 02:44:51 +01:00
Melanie
c2e89334b8
Merge branch 'master' into careminster
2012-11-23 01:44:35 +00:00
Justin Clark-Casey (justincc)
61808d148e
Fix regression where we stopped closing scenes on simulator exit.
...
If we don't do this, then these scenes don't get deregistered from the grid, amongst other things.
Regression was introduced in commit 8c130bc
(Mon Nov 12 22:50:28 2012 +0000)
2012-11-23 01:01:39 +00:00
Melanie
2bdd3eb918
Merge branch 'master' into careminster
2012-11-22 14:47:57 +00:00
Melanie
3b2caa63b0
Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it
...
conflicts with PhysicsShape type defined in later libOMV
2012-11-22 14:45:41 +00:00
Melanie
3c1a58c67a
Merge branch 'master' into careminster
2012-11-22 13:37:27 +00:00
Melanie
c3e1701d43
Merge branch 'avination' into careminster
2012-11-22 13:33:34 +00:00
teravus
98b0cb8df8
* While this is not producing any problems.. and does help in low bandwidth situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet.
2012-11-22 08:13:35 -05:00
Justin Clark-Casey (justincc)
3ce00e97cc
Factor out command script code.
...
This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
2012-11-22 05:57:20 +00:00
Justin Clark-Casey (justincc)
9fcf3f1a3f
Make "config show/set/get/save" console commands available on all servers
2012-11-22 05:48:41 +00:00
Justin Clark-Casey (justincc)
8269d2b893
Factor out common pid file creation and removal code.
...
Log path at which pid file is created or reason for failure to create.
2012-11-22 05:14:43 +00:00
Justin Clark-Casey (justincc)
42e87a6582
Add "get log level" command - this returns the current server session console logging level.
...
This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
2012-11-22 04:57:45 +00:00
Justin Clark-Casey (justincc)
34ff96a119
Remove unused BaseOpenSimServer.ShowHelp()
2012-11-22 04:52:29 +00:00
Justin Clark-Casey (justincc)
4c4379b50f
Make "set log level" command available across all servers
2012-11-22 04:50:09 +00:00
Justin Clark-Casey (justincc)
45d1e6ab09
Make "show info" command available across all servers
...
This helpfully lists version information, startup location and console log level
2012-11-22 04:45:53 +00:00
Justin Clark-Casey (justincc)
cf03d6ea92
Factor out common registration of "show uptime" command
2012-11-22 04:11:03 +00:00
Justin Clark-Casey (justincc)
5c48d7a378
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
Justin Clark-Casey (justincc)
74a20a62ee
refactor: Factor out copy/pasted server uptime report code
2012-11-22 03:43:21 +00:00
Melanie
5f4ac1c5a3
Merge branch 'master' into careminster
2012-11-22 03:40:30 +00:00
Melanie
c4c6121752
Merge branch 'master' into careminster
2012-11-22 03:17:33 +00:00
Justin Clark-Casey (justincc)
448811ccdd
If an asset POST does not contain well-formed XML, return a 400 (Bad Request) HTTP status rather than simply dropping the request.
2012-11-22 03:03:37 +00:00
Justin Clark-Casey (justincc)
33a4f07c4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-22 03:01:26 +00:00
Robert Adams
cbc7e7bf85
BulletSim: Make avatar capsule so it is not circular.
...
Simple attempt to make avatars better shaped.
Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth'
and 'avatarCapsuleDepth'.
More tweeking to avatar height calculation. A little better but
short avatar's feet are above the terrain and tall avatar's feet
are a little below the ground.
2012-11-21 16:43:53 -08:00
Robert Adams
4a0de01704
BulletSim: Properly position mesh terrain on creation (fixes terrain not appearing to be working). Centralize terrain shape creation logic. Remove very chatty detail log messages.
2012-11-21 16:43:45 -08:00
Robert Adams
a59368c4a1
BulletSim: add terrainImplementation parameter with default to Mesh.
2012-11-21 16:43:37 -08:00
Robert Adams
2dc7e9d3fa
BulletSim: fix line endings to be all Linux style (windows style keeps creeping in)
2012-11-21 16:43:29 -08:00
Robert Adams
34cbc738a8
BulletSim: enablement and debugging of mesh terrain.
2012-11-21 16:43:21 -08:00
Robert Adams
71b9640dfa
BulletSim: pull heightmap implementation out of the terrain manager so a mesh terrain can be implemented.
2012-11-21 16:43:14 -08:00
Robert Adams
8dd5813889
BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually having mesh avatars.
2012-11-21 16:43:06 -08:00
Robert Adams
65e55ada87
BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to same.
2012-11-21 16:42:58 -08:00
Robert Adams
d6db0d5740
BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to that enum.
2012-11-21 16:42:50 -08:00
Robert Adams
4d29488216
BulletSim: change PositionSanityCheck to apply a force to correct position corrections (below ground and floating).
2012-11-21 16:42:42 -08:00
Robert Adams
2f5fe4b88e
BulletSim: tweek avatar capsule parameters so avatar feet don't go below ground. This solves the bouncing, short avatar problem (Mantis 6403).
2012-11-21 16:42:34 -08:00
Justin Clark-Casey (justincc)
bac8ac32da
Add regression test for a good request made to the asset service post handler.
...
Adds new OpenSim.Server.Handlers.Tests.dll to test suite
2012-11-21 23:42:34 +00:00
Melanie
45eedb635a
Merge branch 'master' into careminster
2012-11-20 20:25:15 +00:00
Justin Clark-Casey (justincc)
f656adee31
If GetAgents() is called with an empty userIDs array then don't bother with a useless potentially network call on the scene presence service connector.
...
This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument"
which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
2012-11-20 10:22:49 +00:00
Justin Clark-Casey (justincc)
ea65a64f7b
refactor: Move common presence connector code into BasePresenceServiceConnector
2012-11-20 10:11:57 +00:00
Justin Clark-Casey (justincc)
597a101b9f
Minor formatting for 0962a35d
and a few one-line comments as to why that code is there
2012-11-20 05:09:44 +00:00
Iain Oliver
0962a35d2f
Fix movetotarget on mega regions.
2012-11-20 04:54:13 +00:00
Justin Clark-Casey (justincc)
dc5711ad62
minor: If logging full incoming HTTP data, don't deceptively print ... at the end of the body.
2012-11-20 04:10:03 +00:00
Melanie
decc5318a7
Merge branch 'avination' into careminster
2012-11-20 01:21:15 +00:00
Melanie
ccc81183b0
Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
2012-11-20 01:20:59 +00:00
Melanie
0bf66434bc
Merge branch 'teravuswork' into avination
2012-11-20 00:48:13 +01:00
Melanie
9f2d232c71
Merge branch 'master' into careminster
2012-11-19 22:53:03 +00:00
Robert Adams
6c961d8add
BulletSim: Use base class constructors for initialization of BSShape and other classes.
2012-11-18 22:58:36 -08:00
Robert Adams
22be36be69
BulletSim: fix the problem with flying being disabled when crossing region boundries.
2012-11-18 22:57:26 -08:00
Robert Adams
079a1e704f
BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code.
2012-11-18 18:17:30 -08:00
teravus
5e0294815f
* Plumbing and basic setting of the GetMesh Cap Throttler.
...
* Last step is to flip the throttle distribution.
2012-11-17 03:47:09 -05:00
Melanie
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
Melanie
e4659a83f1
Merge branch 'master' into careminster
2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc)
5b79bfc4df
Remove old InventoryService, which has for a long time been replaced by XInventoryService.
2012-11-17 01:32:01 +00:00
Melanie
6faa7fc7f9
Prevent a buffer overflow in asset receiving
2012-11-17 02:31:56 +01:00
Justin Clark-Casey (justincc)
392e84e554
Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid
...
This was necessary historically but hasn't been for many years.
Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
2012-11-17 01:23:29 +00:00
Justin Clark-Casey (justincc)
2aa58c5843
Do not allow invariants to change on calls to XInventoryService.UpdateItem()
...
This is to help track down http://opensimulator.org/mantis/view.php?id=6359 where creator IDs on items and rezzed objects have been reported to sometimes change.
This should never happen - a particular item should never change creators (if an item is given then a new item (with new id) is created).
Invariants are inventory type, asset type, folder (changed only on MoveItems()), CreatorIdentification and Owner.
If caller attempts to change an invariant, warning is logged but other properties are still changed.
If you see this warning, reporting on Mantis 6359 would be very welcome with the exact operation being done at the time.
2012-11-17 01:01:14 +00:00
Justin Clark-Casey (justincc)
e25c51330a
Add basic XInventoryServicesTests.TestAddItem() regression test.
2012-11-17 00:12:25 +00:00
Justin Clark-Casey (justincc)
55f889cc66
refactor: Move stat classes out of StatManager and into their own files for clarity.
2012-11-16 05:02:06 +00:00
Justin Clark-Casey (justincc)
cbc635a9c6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-16 04:48:55 +00:00
Justin Clark-Casey (justincc)
cd088757e9
Add a first draft mechanism for the IncomingPacketsProcessedStat to show the delta over time.
...
The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
2012-11-16 04:36:22 +00:00
teravus
e9153e1d1a
Revert "Merge master into teravuswork", it should have been avination, not master.
...
This reverts commit dfac269032
, reversing
changes made to 619c39e514
.
2012-11-15 10:05:16 -05:00
teravus
dfac269032
Merge master into teravuswork
2012-11-15 09:46:41 -05:00
teravus
619c39e514
* Fixes mesh loading issues in last commit.
2012-11-15 09:44:02 -05:00
Diva Canto
df62d113ab
The last few AssemblyInfos. Finished!
2012-11-14 21:18:18 -08:00
Justin Clark-Casey (justincc)
350cd58e5e
refactor: move common inventory folder version update code to parent class in mysql, mssql and sqlite database plugins
2012-11-15 04:01:30 +00:00
Melanie
5895c4cc6f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-11-15 03:46:10 +00:00
Justin Clark-Casey (justincc)
16dd94b956
Improve inventory folder version updating for mssql database plugin.
...
I am not in a position to test this so the updates have been done blind.
If it needs any fixing will probably require patches.
2012-11-15 03:39:17 +00:00
Justin Clark-Casey (justincc)
1aa0271239
Implement folder version updating for the sqlite inventory plugin
2012-11-15 03:29:55 +00:00
Justin Clark-Casey (justincc)
daf03bfb56
Handle Map block requests on a separate thread rather than the main packet handling thread.
...
This prevents a slow grid information network call from holding up the main packet handling thread.
There's no obvious race condition reason for not doing this asynchronously.
2012-11-15 03:09:20 +00:00
Justin Clark-Casey (justincc)
57273ef7b2
Do HandleMapLayerRequest on its own thread rather than on the main inbound udp packet handling thread.
...
There's no obvious race condition reason for doing this on the main packet handling thread.
2012-11-15 03:07:45 +00:00
Justin Clark-Casey (justincc)
df4da51f04
Following on from 4f982596
, launch map name requests on an async thread from LLClientView directly.
...
This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
2012-11-15 03:04:46 +00:00
Justin Clark-Casey (justincc)
038528dc80
Make PacketPool class stats pull stats instead of push stats so they can be lifted up into LLUDPServer and be distiguished by scene name
2012-11-15 02:02:59 +00:00
Justin Clark-Casey (justincc)
2c36106675
Add IncomingPacketsProcessedCount stat for diagnostics.
...
Also puts some packet processing counts in a container named after the scene so that stats can be collected from more than one scene.
2012-11-15 01:14:18 +00:00
Melanie
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
Diva Canto
35fd4474b2
Added AssemblyInfos in the OpenSim.Server namespace dlls.
2012-11-14 11:20:55 -08:00
Diva Canto
aeeaa3a0a9
Added AssemblyInfos to every dll in the OpenSim.Region namespace.
2012-11-14 11:09:43 -08:00
Diva Canto
27b12cebbb
A few more AssemblyInfos in a few more dlls.
2012-11-14 08:10:15 -08:00
Diva Canto
fcaddd901c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-14 07:50:58 -08:00
Diva Canto
c88e6fb445
Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset service)
2012-11-14 07:50:19 -08:00
Justin Clark-Casey (justincc)
94da908813
More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.
...
Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future.
2012-11-14 04:45:59 +00:00
Justin Clark-Casey (justincc)
2ccb53b42d
If no ISimulationDataStore or IEstateDataStore implementations could be loaded then halt with informative message rather than a later NRE.
...
Halt already occurs if the relevant config sections are not present.
So it also makes sense to halt if the implementations themselves cannot be loaded.
2012-11-14 04:17:39 +00:00
Diva Canto
790b595aa0
Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which had been forgotten.)
2012-11-13 19:50:19 -08:00
Diva Canto
e4cb7af98a
Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file.
2012-11-13 19:26:43 -08:00
Diva Canto
1f9d39c15d
Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll.
2012-11-13 09:54:52 -08:00
Diva Canto
18c5d33f0a
All optional modules' directives moved out of addin.xml
2012-11-13 09:48:56 -08:00
Melanie
556d70feef
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2012-11-13 17:37:39 +00:00
Diva Canto
89a1388857
Deleted .addin.xml. Added AssemblyInfo.cs
2012-11-13 09:04:32 -08:00
Diva Canto
922425a205
Last 27 modules' directives (service connectors out).
2012-11-13 08:49:52 -08:00
Diva Canto
457395d9c1
Another 11 modules' directions moved out of .addin.xml
2012-11-13 08:36:44 -08:00
Diva Canto
608444c9f7
Another 21 modules' directives moved out of .addin.xml
2012-11-13 08:27:51 -08:00
Melanie
af01a2320a
Merge branch 'master' into careminster
2012-11-13 10:49:24 +00:00
Diva Canto
d73aa8c1a6
Moved the WindModule and its own plugins out of .addin.xml
2012-11-12 21:27:23 -08:00
Diva Canto
99ccd4ea44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-12 21:15:35 -08:00
Diva Canto
31177d9259
Another 10 modules' directives moved from .addin.xml
2012-11-12 21:14:58 -08:00
Justin Clark-Casey (justincc)
2fd36653b9
minor: Add some explanative method doc to SceneHelpers.SetupSceneModules()
2012-11-13 04:34:03 +00:00
Justin Clark-Casey (justincc)
f605a62427
Disable code to get server-side to move given items to a destination folder on TaskInventoryAccepted.
...
This is because the fixes to inventory versioning (so that they better match viewer expections)
now appear to allow the viewer to execute #RLV moves, as happens on the LL grid.
Doing it again server-side now wrongly creates another child #RLV folder underneath the root one.
As per http://opensimulator.org/mantis/view.php?id=6311
2012-11-13 04:15:21 +00:00
Melanie
29bfd9e46c
Merge branch 'master' into careminster
2012-11-13 02:28:40 +00:00
Diva Canto
48577af325
More module cleanup: removed the CoreModules.Framework modules directives out of .addin.xml.
2012-11-12 18:23:20 -08:00
Melanie
9a5679876e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
2012-11-13 02:10:09 +00:00
Diva Canto
335ff4359c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-12 18:08:27 -08:00
Diva Canto
86903f23dd
Cleanup on region modules: gave short node id's to all of them.
2012-11-12 18:08:02 -08:00
Melanie
3398999149
Merge branch 'master' into careminster
2012-11-13 01:57:11 +00:00
Melanie
40d5148bbc
Update ScriptModuleComms name space to CoreModules
2012-11-13 01:56:32 +00:00
Melanie
2e0ce70e63
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-12 23:27:47 +00:00
Melanie
4edaa4e41a
Completely remove the IRegionModule interface
2012-11-12 22:56:59 +00:00
Melanie
faca755995
Stop closing old style modules
2012-11-12 22:51:24 +00:00
Melanie
8c130bcaf5
Remove the old style module loader and all references to it
2012-11-12 22:50:28 +00:00
Melanie
e41374dd01
Remove IRegionModule support from the test setup helper
2012-11-12 22:25:35 +00:00
Melanie
0d15a6a01f
Remove any mention of IRegionModule from region names and comments to aid
...
grepping for remaining uses
2012-11-12 19:18:20 +00:00
Melanie
d9b149b375
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-11-12 15:46:45 +00:00
Diva Canto
152d5dc2a7
Fix mantis #6425
2012-11-11 21:13:14 -08:00
Diva Canto
db418bff2b
Fix issues with the DynamicTextureModule and corresponding unit tests.
2012-11-11 19:39:21 -08:00
Diva Canto
113a9704f2
One more module converted: WebStatsModule.
2012-11-11 17:02:22 -08:00
Diva Canto
64fad2f80e
Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule.
2012-11-11 16:44:59 -08:00
Diva Canto
4e8c8b2cd8
One more module converted: MRMModule.
2012-11-11 16:18:47 -08:00
Diva Canto
abef034d1b
One more module converted: IRCStackModule.
2012-11-11 16:10:47 -08:00
Diva Canto
ba2318bd61
One more module converted: PermissionsModule.
2012-11-11 15:59:09 -08:00
Diva Canto
571f6a0300
One more module converted: XMLRPCModule. Removed it from the special loading at start.
2012-11-11 15:29:25 -08:00
Diva Canto
4de8915ddd
One more module converted: VectorRenderModule.
2012-11-11 15:04:02 -08:00
Diva Canto
9f45198516
One more module: DynamicTextureModule. Removed it from the special load in the beginning.
2012-11-11 14:54:40 -08:00
Diva Canto
6759ed1013
One more module converted: LoadImageURLModule. Also removed it from its hard-coded instantiation (I think I understood what the problem was, and that I've done it right).
2012-11-11 14:46:22 -08:00
Diva Canto
963b1e861c
One more module converted: ScriptsHttpRequests.
2012-11-11 14:22:06 -08:00
Diva Canto
84be90e5f8
One more module converted: EmailModule.
2012-11-11 14:00:58 -08:00
SignpostMarv
f560d581bb
document & 80-character width terminal formatting
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
SignpostMarv
23605cf93d
converting NPC module to ISharedRegionModule
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
Diva Canto
c60e1a1ae6
J2KDecoderModule: move the code out of PostInitialise()
2012-11-11 13:49:07 -08:00
Melanie
d84de8c9b6
Merge branch 'master' into careminster
2012-11-11 21:16:58 +00:00
Melanie
3c48b44b68
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-11-11 21:16:29 +00:00
Melanie
b9f602cc77
Prevent datasnapshot from crashing the simulator
2012-11-11 21:16:07 +00:00
Melanie
1a478f868e
Prevent datasnapshot from crashing the simulator
2012-11-11 21:15:39 +00:00
PixelTomsen
37c9700904
moving windlight-sources to correct namespace-named folder (world); add LightShare as Interface
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 11:17:40 -08:00
Diva Canto
6cf90e5516
One more module converted: LightShareModule.
2012-11-11 08:38:39 -08:00
Melanie
389077345f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2012-11-11 16:31:01 +00:00
Diva Canto
d589a8bc04
Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still IRegionModule's and they have been dead for a very long time, so no need to drag them along in this revamping of region modules.
2012-11-11 08:14:58 -08:00
Diva Canto
f85d054bc6
One more module converted: MonitorModule.
2012-11-11 07:46:12 -08:00
Diva Canto
79d51c27bb
One more module converted: InventoryArchiverModule.
2012-11-11 07:31:25 -08:00
Diva Canto
09deaa890d
One more module converted: GroupsModule.
2012-11-10 17:56:25 -08:00
Diva Canto
2ef0062664
One more module converted: XferModule.
2012-11-10 17:48:04 -08:00
Diva Canto
562c585bc6
One more module converted: GodsModule.
2012-11-10 17:34:42 -08:00
Diva Canto
cdcb67a952
One more module converted: GesturesModule.
2012-11-10 17:21:09 -08:00
SignpostMarv
d5f9f5c9c3
document, 80-character width terminal formatting converting comments to documentation for IDE & doxygen goodness
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:47 -08:00
SignpostMarv
b3dddd7447
document & 80-character width terminal formatting
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:47 -08:00
SignpostMarv
a87c4c7d89
Converting WorldCommModule to INonSharedRegionModule
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:46 -08:00
Diva Canto
fe2fa70c74
One more module converted: Combat/CombatModule.
2012-11-10 16:42:52 -08:00
Diva Canto
74dd38db70
One more module converted: AvatarFactoryModule.
2012-11-10 16:24:15 -08:00
Diva Canto
5fb5758103
Cleaning up some confusion with Addin names introduced in a prior commit. Also the Flotsam cache module was being given a different Addin name, I removed that.
2012-11-10 15:54:11 -08:00
Diva Canto
e10d61ea8c
One more module converted: CloudModule.
2012-11-10 11:59:08 -08:00
Diva Canto
b3574d23e4
One more module converted: DataSnapshot.
2012-11-10 11:26:03 -08:00
Diva Canto
3a5e317f65
One more module converted: ObjectAdd.
2012-11-10 10:35:27 -08:00
Diva Canto
26a94610fc
Fix Unit tests -- the module contract was not being honored in the set up of scenes.
2012-11-10 10:21:37 -08:00
Diva Canto
4ac857f902
One more module: EventQueueGetModule. Also making it non-optional for this dll.
2012-11-10 08:48:31 -08:00
SignpostMarv
fb7bbe167a
formatting DialogModule for 80-character width terminal
2012-11-10 08:12:31 -08:00
SignpostMarv
5cba04e2d6
Converting DialogModule to INonSharedRegionModule
2012-11-10 08:12:31 -08:00
SignpostMarv
d0742cea3e
80 character-width terminal formatting of IDialogModule interface, removing superfluous whitespace & line-endings.
2012-11-10 08:12:30 -08:00
SignpostMarv
ee3d06220e
Documenting parameters of methods on the IDialogModule interface
2012-11-10 08:12:30 -08:00
Diva Canto
791c4d5b9f
One more module converted: J2KDecoderModule.
2012-11-10 08:10:43 -08:00
Diva Canto
86b22604fa
One more more converted: IPBanModule.
2012-11-09 22:21:11 -08:00
Diva Canto
a4fee98352
One more module converted: TreePopulator.
2012-11-09 22:09:08 -08:00
Diva Canto
bbff036944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-09 21:59:01 -08:00
Diva Canto
492515cf3f
One more module converted: Vegetation.
2012-11-09 21:58:39 -08:00
Justin Clark-Casey (justincc)
12c62d30e1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-10 05:44:50 +00:00
Justin Clark-Casey (justincc)
c94240ba5b
Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() and make it compile again
...
Not currently in test suite since not yet working.
Also add method doc to Scene.DeRezObjects()
2012-11-10 05:43:57 +00:00
teravus
cda127e30f
* Prep work switching the GetMeshModule over to a poll service.
...
* This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
2012-11-09 23:55:30 -05:00
Diva Canto
4f98259617
Minor improvement in the MapSearchModule. Stop blocking the client thread if the search takes too long.
2012-11-09 20:39:55 -08:00
Diva Canto
2540132a54
MapSearchModule also converted to new region module interface (37 to go).
2012-11-09 16:40:55 -08:00
Diva Canto
19aab3e6fe
Converted the WindModule to the new region module interface (38 to go). Also added both the WindModule and the SunModule to the Plugin manifest.
2012-11-09 16:28:30 -08:00
Diva Canto
7dfd1468cc
Converted the SunModule to the new region module interface. (39 to go...)
2012-11-09 15:38:10 -08:00
Melanie
415b89f434
Merge branch 'master' into careminster
2012-11-09 22:58:42 +00:00
PixelTomsen
64c80aec64
llSetLinkCamera implementation
...
wiki: http://wiki.secondlife.com/wiki/LlSetLinkCamera
mantis: http://opensimulator.org/mantis/view.php?id=6397
2012-11-09 14:31:56 -08:00
SignpostMarv
5bff741544
marking IRegionModule interface as obsolete via System.ObsoleteAttribute, intentionally triggering a bunch of warnings in compiler output in hopes of encouraging other developers to refactor built-in modules when they have free time.
2012-11-09 14:20:24 -08:00
Justin Clark-Casey (justincc)
61b816ebba
minor: Adjust method doc on IXInventoryData MoveItem() and MoveFolder() to make it clear we're moving to an existing folder.
2012-11-09 01:18:11 +00:00
Justin Clark-Casey (justincc)
75c880a6f3
Update parent inventory folder version numbers when folders are moved/created/deleted to match version numbers cached by viewers.
...
This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders).
This should hopefully improve viewer reuse of its cached inventory information.
Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
2012-11-09 01:13:19 +00:00
Dan Lake
9bc0419679
ODECharacter overrides TargetVelocity. No change to existing behavior
2012-11-08 01:18:25 -08:00
Melanie
b3e99a4d48
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
2012-11-08 04:51:00 +00:00
Diva Canto
a407eb287f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-07 20:05:30 -08:00
Diva Canto
eb273b808e
HG: Hopefully this fixes the issues with port 80 once and for all.
2012-11-07 19:59:54 -08:00
Robert Adams
3666518319
BulletSim: add skeleton classes for shape objectification. This will eventually replace all the if's and switches in ShapeCollection with polymorphism.
2012-11-07 15:29:51 -08:00
Robert Adams
67d5dbbb49
BulletSim: add classes for physics motors. Eventually these will replace the manual code for vehicles and add PID functionality to avatar movement.
2012-11-07 15:28:06 -08:00
Robert Adams
ee00c5c885
BulletSim: many changes to tune vehicles for BulletSim.
...
The problem left is that the vehicle sitting on something needs
to press down for gravity and what its sitting on pushes up
so the vehicle does not penetrate. The effect is Bullet calculates
a lot of random angular motion for the vehicle. Various schemes
of damping and zeroing has not resolved the problem.
2012-11-06 18:16:47 -08:00
Robert Adams
76cc303031
BulletSim: Add ZeroAngularMotion method to physical objects. Add inTaint flag to ZeroMotion method. Update the references to those functions.
2012-11-06 18:16:35 -08:00
Robert Adams
e2130817e5
BulletSim: remove limit on taints that can happen before a step. Remove some debugging code (detail log flushing).
2012-11-06 18:16:23 -08:00
Robert Adams
f70a3099b5
BulletSim: recalculate the compound shape bounding box when built.
2012-11-06 18:16:12 -08:00
Robert Adams
702fd1e094
BulletSim: only compute linkset mass when membership changes rather than everytime someone asks for it.
2012-11-06 18:16:00 -08:00
Robert Adams
36d77fe27c
BulletSim: Add separate linear and angular damping function calls. Add function for recalculating compound shape bounding box.
2012-11-06 18:15:48 -08:00
teravus
b2dfa6f022
To keep things consistent allowing an UnregisterModuleInterface... Force the GodModule to request the dialog module interface on a kickuser call and not to use the 'in memory cached one'. Thanks Ar3s for locating the offending inconsistency.
2012-11-06 19:03:41 -05:00
Justin Clark-Casey (justincc)
bf469819a6
Update folder version numbers when moving items and making the Delete(string[], string[]) call (not just string, string).
...
This is to stop viewer inventory cache version numbers becoming out of sync with grid stored numbers when viewer performs these actions.
If there are no problems with these changes, they will be propogated to SQLite (and MSSQL if that's simple enough).
May also need to do the same on folder store/create/delete and maybe propogate version increments up the folder hierarchy, but that requires investigation.
2012-11-06 23:44:52 +00:00
Justin Clark-Casey (justincc)
a8424490ae
Increment version number of a folder when an object it contains is deleted.
...
Not doing this was allowing the viewer inventory cache to become out of sync if an item was directly deleted.
2012-11-06 23:40:33 +00:00
Melanie
5cbf7b3997
Merge branch 'ubitwork' into avination
2012-11-06 11:32:53 +01:00
teravus
182b487243
This implements the Caps throttler. After some testing, the system seemed to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference.
...
Tested with Two Clients on a region with 1800 textures all visible at once.
2012-11-05 22:05:10 -05:00