243499ea4e
send updates on selected attachments as sl ( warinin if reverted then a
...
fix is needed elsewhere since the changes are never sent)
2014-07-22 01:11:18 +01:00
0239c7ba1c
avatar collisions fix
2014-07-21 23:54:53 +01:00
5cdd205ee7
change presence movetotarget avoiding trying to go undergroud or fly when
...
it can walk. ( still needs better code )
2014-07-21 21:31:48 +01:00
d9797b6478
change ava to ava collisions a bit
2014-07-21 19:16:23 +01:00
726490a994
bug fix
2014-07-21 19:15:51 +01:00
72cead2920
Remove extremely spammy error message that isn't an actual error - user
...
ids queried may not exist, since LSL can use this as well, with
arbitrary ids
2014-07-20 23:58:46 +02:00
34c40a1e1a
Remove some already commented lines
2014-07-20 23:58:16 +02:00
c37a88d4f1
Fix LSL portions of sit positioning
2014-07-20 23:54:06 +02:00
719880a6ff
make sittarget camera relative to root prim
...
Please enter the commit message for your changes. Lines starting
2014-07-20 20:20:59 +01:00
5f364dbed5
another change to standup
2014-07-20 16:09:34 +01:00
d6f56a4f99
change avatar standup code
2014-07-20 16:03:05 +01:00
a5fcc0c0c0
remove avn hack on sitted avatars positions
2014-07-20 14:47:35 +01:00
79aea3e588
physicsSit SendSitResponse also relative to parent prim
2014-07-20 09:21:00 +01:00
931434de87
fix physics sit for physical child prims
2014-07-20 09:15:29 +01:00
32b060a608
physics engine cannot change internal positions of linksets, at least not
...
in teaseupdates
2014-07-20 05:54:51 +01:00
b3068355bc
Merge branch 'ubitworkmaster'
2014-07-20 02:27:08 +02:00
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
bef76bf3c5
Fix duplicate attach message being sent to objects picked up from the ground
2014-07-20 01:52:26 +02:00
95f0d582a5
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:18:28 +02:00
5000a5c038
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:17:35 +02:00
07c0ee1fbf
Fix taking objects
2014-07-19 23:17:26 +02:00
e1b2ecdfdc
Merge branch 'avination-current'
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
95b89dd450
fix attachments
2014-07-19 22:18:12 +02:00
9654b81b2d
revert to capsule representation of avatar collider
2014-07-19 16:16:13 +01:00
748fc66ef1
reduce avatar hover in basic ode plugin
2014-07-18 13:19:24 +01:00
d5e0437465
fix Xengine script instance load
2014-07-18 11:43:31 +01:00
19d33c571d
Merge branch 'avination-current' into ubitwork
2014-07-16 16:22:32 +01:00
fc1bd4567d
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2014-07-16 16:16:37 +01:00
159fcbf150
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
527c2cdb1e
Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'
2014-06-21 00:23:11 +02:00
5908e7d0c2
Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'
2014-06-21 00:22:51 +02:00
e0f360e495
Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5'
2014-06-21 00:22:29 +02:00
711441f922
Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2'
2014-06-21 00:21:29 +02:00
94650c43cd
Add forgotten file
2014-06-21 00:08:39 +02:00
d97896d39a
Differentiate between requests only the owner should be able to do and those
...
that managers can do when setting parcel data
2014-04-26 20:32:27 +02:00
1d1e444aed
Convert region loading to new format
2014-04-26 02:43:13 +02:00
5c661baf6c
Allow opening a https port using only http so that nginx can be used for ssl
2014-04-26 02:42:30 +02:00
c77cd6adc7
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
2014-04-23 22:59:28 +01:00
fb321a0573
Prevent sending Land Properties for unprivileged users
2014-04-23 22:59:13 +01:00
f93dac9239
Implement Oren's fix to prevent a privilege escalation with groups
2014-04-20 10:47:31 +02:00
bb841ea9ce
Change OfflineMessageModule to support more differentiated return values and allow support for mobile devices and other non-viewer logins
2014-04-06 23:22:37 +02:00
a30ad71651
Guard against Scene being null in attachments it the wearing avatar is in the process of logging out.
2014-03-25 03:17:44 +01:00
075cf2baa3
Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels
2014-03-25 03:17:04 +01:00
17aeec8860
Reinstate the timed region change signal
2014-03-25 03:16:37 +01:00
c0cdc6b74f
Add delete maptile ability to MapImageService - yet untested
2014-03-18 02:16:00 +01:00
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
cd35d298fa
Merge branch 'justincc-master'
2014-01-28 00:23:10 +00:00
2cf224166f
Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions
2014-01-28 00:11:50 +00:00
f7172095e0
Convert tabs to spaces from previous commit 8c2b41b01
2014-01-28 00:04:55 +00:00
8c2b41b01d
Make inidirectory files supercede distro files
2014-01-27 23:56:10 +00:00
a4017ee1eb
Reinsert attachments list taking code in SP.MakeRootAgent()
...
Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
2014-01-27 23:47:43 +00:00
1b86239f79
refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occur no matter which branch of the conditional is executed
2014-01-27 23:17:09 +00:00
e2fbc88d98
Re-enabled NPCModuleTests.TestCreate()
2014-01-27 22:56:51 +00:00
0eda7dd1c7
Merge branch 'justincc-master'
2014-01-24 19:41:41 +00:00
fea8345f56
minor: remove long unused state queue from "show queues" console reports
2014-01-24 19:40:14 +00:00
c9b5ba78d9
minor: correct the usage statement on the "show image queues" console command - should not have been "image queues show"
2014-01-24 19:36:12 +00:00
4a9796a506
Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) from the "show queues" console report to stop screwing up formatting.
...
"show pquques" already did this
2014-01-24 19:31:31 +00:00
966ab21839
Merge branch 'justincc-master'
2014-01-24 00:17:39 +00:00
a2d5d810e0
Properly dispose of drawing objects to reduce/stop memory leakage on generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
2014-01-24 00:14:58 +00:00
a859464e91
Add "generate map" console command to allow manual regeneration and storage of maptiles
...
Primarily for test purposes though could be useful if one prefers to manually update the map tile
2014-01-23 23:44:21 +00:00
83626e60e6
Adds a configuration option to cannibalize bandwidth from the
...
udp texture throttle and move it to the task throttle. Since most
viewers are using http textures, the udp texture throttle is holding
onto bw that could be used for more responsive prims updates. See
the documentation for CannibalizeTextureRate in OpenSimDefaults.ini.
Option is disabled by default.
2014-01-20 18:59:43 -08:00
7bd42fc42f
Add back code to UuidGatherer to retrieve UUIDs for materials stored in DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented
2014-01-20 15:01:18 -08:00
af58631f00
rather than converting existing materials to assets, just retrieve them and make them available for viewing. Any new materials added to the scene will become assets.
2014-01-20 13:57:14 -08:00
719810e9d8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-20 11:54:36 -08:00
1cae3664a5
add null texture entry face check before converting legacy materials
2014-01-20 11:53:33 -08:00
5fc871027e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-20 19:38:47 +00:00
2cf7478b9a
Merge branch 'justincc-master'
2014-01-20 19:34:55 +00:00
2e78e89c36
Clean up orphaned json stores. This can happen when an object is
...
removed, when a script is removed, or when a script is reset. Also
added a stats command to track the number of json stores used by
a region. Will probably add some more commands later.
2014-01-20 11:33:49 -08:00
8e72b53edc
Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points.
2014-01-20 19:16:19 +00:00
36d8a24a86
force SOG update when converting legacy materials to ensure changes are persisted
2014-01-20 03:11:01 -08:00
95c926b2cd
delay texture entry parsing until absolutely necessary while converting legacy materials
2014-01-20 03:02:30 -08:00
28723beb0c
Add code to convert legacy materials stored in DynAttrs to new asset format and store them as assets
2014-01-20 02:57:08 -08:00
d1f16c4b4b
Check agent permissions before modifying an object's materials. Also, when creating a Material asset, set the current agent as the Creator.
2014-01-20 00:38:44 -08:00
68d83425c6
When asked to change the Material for one face, change only that face; not the default material
2014-01-20 00:38:43 -08:00
3018b2c5d7
Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default
...
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
2014-01-20 00:38:42 -08:00
ca0336d834
Renamed MaterialsDemoModule to MaterialsModule
2014-01-20 00:38:41 -08:00
e8273fa8ad
- Materials: support the viewer removing the material (in which case matsMap["Material"] is missing) - Reduced logging
2014-01-20 00:37:26 -08:00
4fb3d314b8
Fix casting error for float type INI file parameter parsing.
2014-01-19 07:37:14 -08:00
d466446df3
Merge branch 'justincc-master'
2014-01-18 01:39:45 +00:00
e9454d4672
Following on from 50ea2e0, only fetch scene presence for check if lightscript function has failed initial IsEstateManagerOrOwner() check
2014-01-18 01:36:40 +00:00
50ea2e0d67
Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene
2014-01-18 01:26:30 +00:00
0cbe5f8424
Remove redundant methods in FlotsamAssetCache
2014-01-18 00:55:49 +00:00
b9453a8f6f
implement CoreAssetCache.Check()
2014-01-18 00:52:36 +00:00
427ffd3387
implement GlynnTuckerAssetCache.Check()
2014-01-18 00:48:20 +00:00
fc7ccfdafa
Properly implement CenomeAssetCache.Check()
2014-01-18 00:30:23 +00:00
ee8ba1ab9a
Simplify FlotsamAssetCache.CheckFromMemoryCache()
2014-01-18 00:21:53 +00:00
d381da81d6
minor: Add method doc to IImproveAssetCache
2014-01-18 00:15:38 +00:00
97fbb8ed45
Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use using() construct to ensure filestream is always closed
2014-01-18 00:12:12 +00:00
12bfce7b9f
elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()
...
Passed in asset is always not null
2014-01-18 00:06:12 +00:00
b52b50ee56
minor: reinsert some method doc back into IEntityTransferModule
2014-01-17 23:36:23 +00:00
9fefbcf7fc
minor: since structs are values, assigning them to another variable copies it. Instantiation is unnecessary.
2014-01-17 23:32:37 +00:00
14c72d4a5b
Revert "Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene"
...
This reverts commit 39e5785c0f
2014-01-17 01:58:10 +00:00
39e5785c0f
Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene
2014-01-17 01:47:37 +00:00
4fa843ff19
Reorder checks in SP.CompleteMovement() to fix test failures
2014-01-16 23:44:17 +00:00
f467121c51
Merge branch 'justincc-master'
2014-01-16 23:33:30 +00:00
3bc669ffc7
Actually put IsChildAgent = true inside the lock, otherwise there is still a small window for race conditions on duplicate CompleteMovement calls
2014-01-16 23:31:50 +00:00
3ffd90496a
Prevent duplicate invocations or race dontision in SP.CompleteMovement()
...
This can happen under poor network conditions if a viewer repeats the message send
If this happens, physics actors can get orphaned, which unecessarily raises physics frame times
2014-01-16 20:23:31 +00:00
1a8b56fa87
Merge branch 'justincc-master'
2014-01-16 00:33:04 +00:00
2d9d6fe922
Can delete the Offline Messages sent to/from a user.
...
This is useful if the user is deleted.
2014-01-16 00:24:51 +00:00
46c2791fe2
In the offline message table, store the sender.
...
This data is useful for preventing abuse (e.g., someone who sends too many messages), or for deleting message if their sender has been deleted.
2014-01-16 00:16:33 +00:00
21bc799a17
Fixed offline IM
2014-01-16 00:10:10 +00:00
e99a7d879e
Remove old IInterRegionComms and references. This hasn't been used since 2009 and was superseded by ISimulationService
2014-01-16 00:05:04 +00:00
321bde8a3a
Minor: Add prentheses to make a condition clearer
2014-01-15 22:20:42 +01:00
239b85d7ce
Fix crash in BulletSim which sometimes happens making a linkset physical
...
(like sitting on and activating a vehicle) and crossing borders.
This keeps better bookkeeping on compound shapes so BulletSim can
identify them when being freed.
2014-01-10 22:52:31 -08:00
b5ef585069
Merge branch 'justincc-master'
2014-01-11 01:22:42 +00:00
bc0ff5e7d4
Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.
2014-01-11 00:54:41 +00:00
09e800f4b1
Merge branch 'justincc-master'
2014-01-10 20:46:00 +00:00
08f2fc63cd
Fixed llTextBox error message text
2014-01-10 20:43:24 +00:00
68cbccb288
Merge branch 'justincc-master'
2014-01-10 20:37:14 +00:00
9050c152b4
Dynamically adjust to the number of visual params sent.
2014-01-10 20:31:52 +00:00
da47bcae3e
When moving the root prim of an attachment: a) Change the attach position; b) Move the other prims in the reverse direction to compensate
2014-01-10 20:24:11 +00:00
5e72de1908
Merge branch 'justincc-master'
2014-01-10 20:19:38 +00:00
88f01a4130
When creating a coalesced object, set its permissions to the lowest-common-denominator of all the sub-objects
2014-01-10 20:01:08 +00:00
a94e1e0e08
When creating a coalesced object, set its Creator ID if all the objects have the same creator
2014-01-10 19:54:17 +00:00
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
13f31fdf85
Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory.
...
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
2014-01-10 19:37:59 +00:00
32e9c16957
Merge branch 'justincc-master'
2014-01-08 01:04:26 +00:00
0155d42b80
If an agent is sitting, then do send the rotation in the agent update instead of zeroing it to resolve mouselook camera problems
...
Addresses http://opensimulator.org/mantis/view.php?id=6892
Thanks to tglion for this spot.
This resolves a recent regression from 17b32b764a
2014-01-08 00:54:39 +00:00
1eecb34e62
Remove the core module extra profile settings support carried in with the latest
...
patches. We don't need it.
2014-01-05 21:16:30 +00:00
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
31279a3308
Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminster
2014-01-05 20:03:48 +00:00
38148bd4b6
Some missing definitions needed for successful compilation.
2014-01-04 19:01:05 -08:00
8ff2ff1a36
Remove some chatty DebugFormat statements. No functional changes.
2014-01-04 19:01:04 -08:00
7e32313a49
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
2014-01-04 19:01:04 -08:00
004ecee314
varregion: send region size in LLLoginResponse.
2014-01-04 19:01:03 -08:00
d9848943a9
Add routines in Util.cs for conversion of region handles to region
...
locations and for the conversion of region world location to region
'region' location. These routines will replace all the arithmatic
scattered throughout OpenSimulator.
2014-01-04 19:01:03 -08:00
dd96fef940
Dynamically adjust to the number of visual params sent.
2014-01-04 21:18:37 +00:00
eab9390e05
Initialize default region size in GridRegion in the no parameter constructor
...
as is used by the grid connector tests.
2013-12-28 07:20:14 -08:00
6869633d76
Add serialization/deserialization of region size to RegionInfo, GridRegion, and RegionData.
...
This does not modify interfaces or handling of variable sized regions. This only
enables the loading and storing of the region size and the reporting of the
region size in grid service responses.
The database tables already have the code to load and store the region size.
2013-12-28 06:58:15 -08:00
540fa84842
Merge branch 'justincc-master'
2013-12-21 01:12:45 +00:00
2f94165dcc
Add lsl arg syntax checking for control event
2013-12-21 01:00:50 +00:00
f1cd813a29
refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for consistency
2013-12-21 00:49:01 +00:00
871ac5b16c
Add arg checking for at_target lsl event
2013-12-21 00:46:34 +00:00
a5e4780547
Add lsl event arg checking for at_rot_target
2013-12-21 00:37:56 +00:00
b757ab2586
Add lsl event argument checking for attach and on_rez
2013-12-21 00:08:36 +00:00
68773ee7c4
Merge branch 'justincc-master'
2013-12-19 01:41:04 +00:00
e298bf41ff
Add missing viewer param elements for butt and breast physics.
...
Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces
Thanks cinderblocks!
2013-12-19 01:24:36 +00:00
a5ca15c428
Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending
2013-12-18 23:35:38 +00:00
141d771a93
Fix issue with editing notes for other avatars
2013-12-16 17:36:21 -05:00
b03ec6137f
Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user.
2013-12-16 17:36:04 -05:00
fe01e7d1cc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-16 22:11:03 +00:00
f69e91dc2d
This is the acutal sitting avatar crossing code. This commit implements the
...
actual crossing mechanics for seated avatars, using the supporting code from
the previous commits. Physics is not supported yet, although some few bits
for them are already in place due to the earlier code drops. With this commit,
crossing sitting avatar by "editing" the prim across the border, by using
llSetPos or keyframe motion may already be possible. Vehicles will come next.
2013-12-16 22:08:02 +00:00
00e632ec3a
Merge branch 'justincc-master'
2013-12-14 02:49:23 +00:00
51da52f904
Extend TestLlGetNotecardLine() regression test to contain chars that are two bytes in utf8
2013-12-14 02:48:29 +00:00
38d7d46c17
Merge branch 'justincc-master'
2013-12-14 02:33:08 +00:00
957449e62c
ParseNotecardToList() returned data past end of notecard text (mantis #6881 ).
2013-12-14 02:25:28 +00:00
ee163b5751
Merge branch 'justincc-master'
2013-12-14 02:23:12 +00:00
e7a294e739
Wrap analysis of the particle system in the UUID Gatherer in a separate try/catch as sometimes it appears that this can be corrupt.
...
As per Oren's suggestion.
2013-12-14 01:48:03 +00:00
996a6c2eea
After previous discussion, put eye-catcher 'SCRIPT READY' messages to console rather than log as warning
...
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
2013-12-14 01:34:28 +00:00
63ccc3dbf5
Convert if-blocks to return statements in small functions such as GetStartParameter().
2013-12-14 01:20:24 +00:00
bf826699a5
Merge branch 'justincc-master'
2013-12-14 01:13:17 +00:00
d656ec2a07
Make WindParamSet success a console message rather than a log message.
...
This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
2013-12-14 01:07:37 +00:00
5ddd818238
minor: Make wind console commands print out to console rather than log
2013-12-14 00:50:06 +00:00
bcb8c4068e
Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and NPC tests until positions are known to be stable.
...
Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor
2013-12-14 00:36:25 +00:00
d2d4ae541b
Fix build break in test from previous commit 54cc229 - hadn't realized ScenePresence inst var name was slightly different
2013-12-14 00:19:04 +00:00
54cc229768
Fix TestSitAndStandWithNoSitTarget NPC and SP tests.
...
These stopped working because current code calculates sit heights based on avatar physics rather than appearance data.
Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
2013-12-14 00:10:32 +00:00
11f177d6a8
Eliminate unnecessary line from my previous commit 1d605642
2013-12-13 23:30:08 +00:00
1d605642f7
Refix sitting on child prims by reinserting relevant code back into SP.HandleAgentSit()
2013-12-11 23:59:52 +00:00
82ebb86d58
Replace proprietary file header with BSD one
2013-12-11 01:51:57 +00:00
92aad6f1bb
Add missing files *blush*
2013-12-11 01:44:03 +00:00
5b73b9c4a8
Committing the Avination Scene Presence and related texture code
...
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
2013-12-11 01:39:56 +00:00
3df8990e6f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-11 00:14:16 +00:00
97934e00e6
This is the Avination Entity Transfer Module. Surprisingly, it still compiles
...
but I don't know if it runs. Will probably crash and burn as the supporting
code isn't there yet.
2013-12-11 00:12:36 +00:00
0875050161
Add console utility commands "scale scene" and "translate scene". Note that repeated use of these commands will induce floating point accumulation errors. Please back up your region before using.
2013-12-10 13:57:18 -08:00
958a8f274b
Revert "Add support for user preferences (im via email)"
...
This reverts commit 1842388bb4
2013-12-07 01:29:15 +00:00
ba48816fb6
Merge branch 'master' into careminster
2013-12-07 01:19:20 +00:00
6d6b9ab791
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-07 01:08:49 +00:00
8f221a3077
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:25:26 -08:00
c0380d1bfe
apparently mono DeflateStream has no CopyTo method =(
2013-12-06 16:24:44 -08:00
5047bd7b44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:02:03 -08:00
4058e5f709
Fixed misleading comment
2013-12-06 16:01:29 -08:00
aba2a44453
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 15:58:51 -08:00
1496de7ce9
use System.IO.Compression.DeflateStream for mesh decompression in an attempt to reduce mesh asset decoding failures
2013-12-06 15:58:19 -08:00
1842388bb4
Add support for user preferences (im via email)
2013-12-06 02:52:13 -05:00
04f8fc1ce9
Adding profile partners fix to SQLite and PgSQL drivers
2013-12-05 20:25:28 -05:00
823a175f07
Stop writing partner id to record when updating profile data. This should be changed only by admin in backend.
2013-12-05 20:06:04 -05:00
9b76a46df0
Reversing back to the row["ColumnName"] case field name. http://opensimulator.org/mantis/view.php?id=6868
2013-12-06 00:41:02 +00:00
bb4f4d9480
minor: Use enums for setting inv/asset types on data upload rather than magic numbers
2013-12-06 00:38:18 +00:00
16aaba77d4
Properly set InventoryType.Snapshot when a snapshot is uploaded
...
Resolves http://opensimulator.org/mantis/view.php?id=6857
This prevents the inventory service complaining later about an attempt to change an invariant
2013-12-06 00:30:44 +00:00
17b32b764a
Fix regression where mouse look flight direction no longer worked by zeroing x/y rot before sending agent updates, instead of before any agent update processing
...
It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook.
Doing this in the terse send so that we preserve mouselook rotation information
2013-12-05 02:10:46 +00:00
62a2d7836f
Ignore X and Y body rotations when sent by mouse look.
...
Fixes http://opensimulator.org/mantis/view.php?id=3274
When not in mouselook, avatar only sends rotations around the Z plane (since that's the only way an avatar can rotate).
However, in mouselook it also sends X and Y information. But sending X and Y in terse updates causes issues with wrong camera movement in mouselook.
So strip out X and Y components for now. If this is an issue, then could strip out before sending avatar terse update, though this generates more cpu work.
Thanks to mirceakitsune for suggesting an initial fix
2013-12-03 02:27:40 +00:00
8ebad90800
Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced for slow walk/run in 4cfe02a rather than the magic number
2013-11-30 01:56:46 +00:00
96018afab4
Remove unused SP.Updated flag, which appears unused for many years and was only set true once and never reset
2013-11-30 01:52:45 +00:00
4cde02a2a3
Implement most effects of AGENT_CONTROL_STOP
...
AGENT_CONTROL_STOP is specified to SP.HandleAgentUpdate if the user holds down the space bar on a viewer.
For a stopped avatar, this prevents fly or walk/run (though not rotate) until released.
For a walking/running avatar, this reduces movement to half speed.
For a flying avatar, this stops the avatar.
These are observed behaviours on the LL grid - there was no previous OpenSimulator implementation
This commit introduces an optional parameter to SP.AddNewMovement(), which means that it will no longer compile on .NET 3.5 or earlier versions of Mono than 2.8
Currently, this does not work for jumping, and if used whilst flying the avatar continues the fly animation even though it does not move
2013-11-30 01:44:30 +00:00
4bd4f1cd83
Remove nudgehack from SP.HandleAgentUpdate by making MovementFlag a uint rather than a byte
2013-11-30 01:14:12 +00:00
8b3a4367ea
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero
2013-11-29 02:51:35 +00:00
5f0e763062
Remove unused sp.ParentPosition, which has not been used for some time
2013-11-29 02:48:59 +00:00
84bfde3bdf
Comment out debug sit message accidently left active
2013-11-29 02:45:14 +00:00
ca079c378a
Merge branch 'link-sitting'
2013-11-29 02:41:32 +00:00
868c0c2746
Fix regression where sitting on ground stopped working.
...
This was due to the PhysicsActor no longer being recreated on stand from ground.
2013-11-29 01:56:49 +00:00
f9193e3c51
Restore SP.AbsolutePosition to properly return actual absolute position when sitting
2013-11-29 01:50:12 +00:00
a64377149d
Add parameter checking for land_collision, land_collision_start and land_collision_end lsl events
...
Wrong number of parmeters now generates syntax error on compile, as seen on LL grid
2013-11-29 00:44:53 +00:00
73dadef8df
Change the log level for the LOGIN DISABLED and LOGIN ENABLED messages is
...
the RegionReady module to be warn so that the message will show up in the
log for simulators running in a more production mode (knowing when logins
are functional is useful).
2013-11-27 12:01:09 -08:00
e52a8d388f
"rotate scene" command now uses Constants.RegionSize / 2 to pick the center of rotation and center can be optionally overridden in the command line
2013-11-26 21:07:37 -08:00
0785210e29
Fix stand positions rather than having the stand jump to the root prim.
2013-11-27 02:08:22 +00:00
5a9ec0748b
add a "rotate scene" console command. Seems to work for prims/sculpts/mesh but not for foliage, don't know why. Also doesn't work on terrain. Successive use of this command will likely introduce floating point error accumulation. Back up your region before using it :)
2013-11-26 17:18:44 -08:00
a3c72dafe6
Only translate linked prim specified offset pos by the link prim rotation, not any specified avatar rotation as well.
...
Don't translate root prim position by avatar rotation.
2013-11-26 01:40:55 +00:00
36d146bf27
fix position changes when sitting on a prim with position and/or orientation explicitly specified
2013-11-26 00:43:35 +00:00
0ad45531a1
Corrected case to get columns from Regions table from PostgreSQL http://opensimulator.org/mantis/view.php?id=6865
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2013-11-25 18:33:49 -05:00
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
60e049ea39
Revert "Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook"
...
Reverting to place on separate branch
This reverts commit ff4e7de776
2013-11-23 02:31:39 +00:00
1999b218fd
Revert "Add line accidentally left out of recent non-root prim sit fix"
...
Reverting to place on new branch
This reverts commit ed1029712a
2013-11-23 02:31:17 +00:00
a68d1fad73
Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero"
...
This reverts commit 9bdd3dc7de
2013-11-23 02:29:14 +00:00
eb172be541
Revert "Fix non-root prim sit positions for prims where a sit target has been specified as well."
...
Revert to place on separate branch for now
This reverts commit 70e651a8d1
2013-11-23 02:28:30 +00:00
910f07dffa
Revert "Refix fix for sitting on non-root linked prims with explicit sit targets."
...
This reverts commit 78649eb099
2013-11-23 02:27:26 +00:00
5aa3236ebe
Revert "fix avatar rotation when sitting on a linked part"
...
Reverting for now to place on separate branch
This reverts commit 65304260af
2013-11-23 02:27:03 +00:00
b9e42aeb6e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-23 02:09:54 +00:00
65304260af
fix avatar rotation when sitting on a linked part
...
Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
2013-11-23 02:09:03 +00:00
f3f3d390f7
Fixed the update StoreRegionWindlightSettings() wasn't updating regionwindlight table, raising PrimaryKey violation;
...
Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2013-11-22 20:48:12 -05:00
78649eb099
Refix fix for sitting on non-root linked prims with explicit sit targets.
...
I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
2013-11-23 01:35:08 +00:00
70e651a8d1
Fix non-root prim sit positions for prims where a sit target has been specified as well.
2013-11-23 01:32:29 +00:00
ed1029712a
Add line accidentally left out of recent non-root prim sit fix
...
Original commit is ff4e7de7
2013-11-23 01:18:07 +00:00
9bdd3dc7de
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero
...
As far as I can see it's valid to change the eye offset even if you aren't changing the at target.
2013-11-23 01:12:20 +00:00
9f4a548a49
Fix false positive test failure in TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up.
...
Use 0.0.0.0 instead of localhost
2013-11-23 01:04:31 +00:00
ff4e7de776
Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook
...
We now specify sits as offsets from the root prim, as the viewer expects.
2013-11-23 00:53:09 +00:00
c896b4179e
Added admin_authenticate_user command
2013-11-20 00:09:32 +00:00
b44c69807d
Fix bug where "show modules" would accidentally list all the shared modules again as "non-shared"
...
Addresses http://opensimulator.org/mantis/view.php?id=6860
2013-11-19 23:53:15 +00:00
f9984a9685
rename private field ACD.ViewerInternal to m_viewerInternal in line with conventions used elsewhere in code
2013-11-19 23:39:52 +00:00
b71952df49
Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has been set.
...
Continue to return null instead.
2013-11-19 23:36:44 +00:00
9ba5a7e190
Normalize viewer version string to accomodate new style version reporting in the viewers
2013-11-19 23:29:10 +00:00
f94d07f2e2
Add regression test to check that specifying a non-existent event raise a syntax error
...
This was the case before any of the recent changes
2013-11-16 03:02:57 +00:00
79c1ed8cb9
Add syntax checking for no_sensor() no-arg event
2013-11-16 03:00:03 +00:00
ec4d96acc9
refactor common code out of no argument LSL event regression tests
2013-11-16 02:58:06 +00:00
edd7e19463
If anything other than a single integer is specified for events that only take a single integer, generate a syntax error on LSL script compile rather than an exception later on.
...
This applies to events changed, collision, collision_start, collision_end, on_rez, run_time_permissions, sensor, touch, touch_start, touch_end
2013-11-16 02:50:14 +00:00
62006baaef
Make state_exit, moving_end, moving_start, not_at_rot_target, not_at_target and timer LSL events generate a syntax error if inappropriately given arguments.
...
This matches behaviour seen on the LL grid and a previous change for state_entry.
These are all the events which should take no arguments
2013-11-16 01:30:23 +00:00
d728c1beb2
refactor LSL_EventTests.TestStateEntryEvent into single method to test compile
2013-11-16 01:25:25 +00:00
ecfb78dd16
minor: Use default(UUID) in rez attachment failure error logging rather than (UUID)null
...
Patch from http://opensimulator.org/mantis/view.php?id=6843
Thanks Kira.
2013-11-15 23:16:12 +00:00
346644016c
If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase folder when required, then don't try to store the null and perform other operations on it.
...
Patch from http://opensimulator.org/mantis/view.php?id=6844
Thanks Kira.
2013-11-15 23:10:59 +00:00
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
b4932bda2a
If a local land ID is given to the "land show" command, then output to console the full details of that parcel.
...
Using "land show" without a land ID still outputs a summary of parcels in the region
2013-11-15 00:16:33 +00:00
8114ae0f8b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-13 23:27:25 +00:00
7da10850b0
Fix bug where removing a physical linkset would only decrement the Active Objects statistic by 1 instead of by the number of prims removed.
...
Unlike LL, OpenSimulator currently uses this stat to record the number of prims in the physics simulation, even when they are at rest.
Added regression test for this case.
2013-11-13 23:25:54 +00:00
869a23e223
Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions.
...
Also fixes some issues in associated solution files
2013-11-13 01:07:14 +00:00
fd24147afa
Add initial test for checking that specifying a parameter in LSL state_entry() generates a syntax error.
...
Same for other events to follow at a later date.
2013-11-09 00:36:05 +00:00
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
5cef8bf64e
Make admin_save_oar request submit a request ID and log this for tracking.
...
Previous behaviour of always logging 'name' is unhelpful since this actually an error message parameter which is only filled out if an error has occurred
2013-11-08 00:31:26 +00:00
0b4577d5b0
add support for particle glow LSL functions
2013-11-05 23:48:44 -08:00
709814c194
add support for particle blending LSL functions
2013-11-05 23:38:43 -08:00
26fd29622d
Added sending (for now hard-coded) sim isze in SendMapBlockSplit()
2013-11-06 03:52:04 +01:00
8e1bf55e7b
Add IncomingPacketsResentCount clientstack statistics
...
This records how many packets were indicated to be resends by clients
Not 100% reliable since clients can lie about resends, but usually would indicate if clients are not receiving UDP acks at all or in a manner they consider timely.
2013-11-06 01:02:20 +00:00
caf2abe311
Record individual region bot disconnects in pCampbot log
2013-11-05 23:32:26 +00:00
fb23f78928
minor: comment out "SetLastPosition" GridUserService debug message for now.
2013-11-05 23:18:09 +00:00
2d315ec207
Fix a race condition where pCampbot actions could continue even if a bot had disconnected.
2013-11-05 20:58:52 +00:00
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
2b069a3b1e
If the LSL state_entry() event definition contains any parameters, then generate syntax error as seen on the LL grid
...
This is done through the parser and so generates the same syntax error message if any parameters are wrongly specified for this event.
We were already enforcing event names in the parser.
This is only for state_entry so far as an initial test of the approach - appears to work correctly.
2013-11-02 00:39:12 +00:00
7faf286d00
add null check for jpeg2000 sculpt image decode failure. Note: the j2kDecodeCache folder should be cleared after updating to this revision so that sculpts containing alpha can be re-decoded and successfully meshed.
2013-11-01 13:45:09 -07:00
ce94f990bb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-01 01:42:43 -07:00
f4ded3af63
discard alpha in 4-plane sculpt textures before generating physics proxy mesh
2013-11-01 01:40:56 -07:00
db32e5d304
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-01 02:05:12 +00:00
c6395240f0
For individual bots, seed random number generator with a random number from BotManager rather than Environment.Tickcount
...
Otherwise, since bots are now created all at once, a bunch will get exactly the same tickcount and hence number sequences
2013-11-01 02:04:04 +00:00
cc73ef4eb9
add new particle system blending rule enumerations
2013-10-31 17:49:01 -07:00
cc7065f9ee
minor: change "bot" pCampBot help cateogry to "Bots"
2013-11-01 00:04:18 +00:00
4c4a1cf715
Start counting resent packets in the places that I missed when the stat was first added a few commits ago
2013-10-31 23:59:22 +00:00
50794c9008
minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBakedTextureModule
2013-10-31 23:51:01 +00:00
3d5a7e9b19
Add OutgoingPacketsResentCount clientstack stat.
...
This allows one to monitor the total number of messages resent to clients over time.
A constantly increasing stat may indicate a general server network or overloading issue if a fairly high proportion of packets sent
A smaller constantly increasing stat may indicate a problem with a particular client-server connection, would need to check "show queues" in this case.
2013-10-31 23:45:52 +00:00
b7c57294cc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-31 23:45:19 +00:00
eb52d346c0
add new LSL constants associated with new "ribbon", "glow", and "blend" particle system functionality. Note that this does *not* complete required server side changes for implementing the new particle system
2013-10-31 16:13:03 -07:00
0e07fad2e1
minor: update pCampbot usage/help statement
2013-10-31 20:19:57 +00:00
fdd1c63c3c
Make "fcache status" command also display information on disk/mem cache hit rate that is currently only displayed if LogLevel >=1 in [AssetCache] config
2013-10-30 18:57:51 +00:00
28f36d8db5
Put fcache commands output to console, not log
2013-10-30 18:32:53 +00:00
edaf0a98d6
Give the caller AddMapTile a valid reason response if this failed due to blank response from server or connection failure.
...
Raise log lines which indicate problems to warning from debug
2013-10-29 23:37:22 +00:00
26c2d9e627
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-28 23:48:43 +00:00
39de7614ec
Remove legacy sqlite lines added internally by OpenSimulator to the [Startup] section.
...
These are long unused but confusingly will be seen in the [Startup] section on a "config save".
2013-10-28 18:03:34 +00:00
93d5d66fbd
BulletSim: update collision flags to make sure they fit in the shorts provided.
2013-10-26 21:20:19 -07:00
df76e52310
minor: Add commented out code for apparent passing of texture IDs in ObjectProperties UDP replies to viewer
...
Not yet shown that this is used or resolves a bug where not all textures appear on objects with an "XML with textures" upload from singularity 1.8.3
Proper texture entries are actually present and appear properly on relog, but not on select from viewer until at least one face texture is changed.
2013-10-24 23:00:02 +01:00
31989bd51e
Show texture ids for full object/part info console commmds
2013-10-24 21:29:57 +01:00
cccdfcb59e
Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. Appears to be a never used method.
2013-10-24 00:37:49 +01:00
5d61c4039d
Only set the data present event if we actually queued an outoing packet (not if we sent immediately)
2013-10-24 00:33:14 +01:00
511122834b
BulletSim: change collision flags for groundplane to not interact with static objects.
...
Reorder collision flag setting code for terrain to fit pattern used elsewhere.
2013-10-23 16:07:03 -07:00
84a149ecbf
Call ScriptSleep() instead of llSleep() in routine for llEmail.
...
Signed-off-by: teravus <teravus@gmail.com>
2013-10-18 14:30:05 -05:00
0094971186
After finishing to edit an attachment, let other avatars see the changes. (The changes weren't visible before because updates to attachments aren't sent while the attachment is selected.)
2013-10-17 23:10:16 +01:00
67ffb64764
Corrected estateID to EstateID on getEstates function at PGSQLEstateData.cs
2013-10-16 21:58:22 -05:00
f83343d302
* One More thing, add an appdomain data element to ensure that we don't duplicate the assembly resolving.
2013-10-16 21:20:11 -05:00
8fdf70b87e
* Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - Mono.Security.dll missing. The root of the issue is that the Postgres driver relies on Mono.Security.dll from the mono project. Unfortunately, when using Mono, including the dll in the distribution causes conflicts. This solution puts Mono.Security.dll in bin/lib/NET/ and, if windows .NET is the runtime, informs the assembly loader to load bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security namespace. On Mono, the included Mono.Security assembly is ignored.
2013-10-16 20:16:29 -05:00
766a31431e
BulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disables
...
the vehicle buoyancy if the vehicle is above its hover height.
This is a known misfeature of this vehicle flag which has been accepted
since it would break too many implementations. The problem is noticed
when creating a jetski-like vehicle that jumps over sand bars. A boat
normally is configured with neutral buoyancy and hovering at water
height. When it jumps the sandbar, it needs to have gravity applied
to get back to water level.
2013-10-15 17:02:22 -07:00
d0c1780839
Fixed rezzing coalesced objects from a prim's inventory
...
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
2013-10-15 23:59:16 +01:00
d82d6bb1ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-15 23:18:50 +01:00
5ca7395e17
Added support for attachments to group notices when using Flotsam groups.
2013-10-15 23:07:49 +01:00
3e1ca2bd21
* Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)
...
* Please test
2013-10-15 11:55:08 -05:00
f106ba87ca
Made terrain uploads thread-safe
2013-10-15 00:12:56 +01:00
ff8a768258
Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.
...
* Added PostGreSQL support
* Added MySQL/MySQLXGroupData.cs
* PostgreSQL data access implementation
* PostgreSQL dll binarie and RegionStore.migrations
* Migrations Scripts from MSSQL to POSTGRES
* Postgres SQL Type fixes
* Postgres SQL Connection string
* Data type issues
* more fixes
* tests and +tests
* UUID x string - FIGHT!
* Fixed PG types to internal csharp types
* More data type fix (PostgreSQL fields are case sensitive) :(
* more field case sensitive fixes
* changed the migration files to be case sensitive for fields.
* fixed fields case
* finished converting, now search for hidden bugs.
* some more fixes
* bool type fixed
* more case fixes;
* creatorID case fixed
* case fields fixed
* fixed default now() for TMStamp fields with don't allow nulls.
* fix case sensitve for Region name and Estate name
* fixed case for names for search
* fix class name Error
* Bug fixed on select and migrations
* Un-Reverting my change due to Postgres issue with the ILIKE function
* Fixed some issued for Diva Distro
* Fixes for integration with Diva Distro
* Added System.Core to prebuild.xml for PG project
* Configured to make DIff for Push to OpenSim Project
* Diffs only to PostgreSQL mods.
2013-10-12 16:33:45 -05:00
8b5e2f2cd2
BulletSim: Fix snap back from edge of region problem. Mantis 6794.
2013-10-11 13:29:43 -07:00
75f63ecfcd
* Add a session concurrency option per key. Allows developer/config to specify number of concurrent requests on a service.
2013-10-09 22:21:25 -05:00
e7ea053c4a
* Remove a test *cleanup*
2013-10-07 23:52:44 -05:00
1df58d04b1
* Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes belong there.....)
...
* Add an IsBlocked(string Key) method so it can be used more generically. (think.. if we want to rate limit login failures, we could have a call in the Login Service to IsBlocked(uuid.ToString()) and ignore the connection if it returns true, if IsBlocked returns false, we could run the login information and if the login fails we could run the Process method to count the login failures.
2013-10-07 23:48:24 -05:00
75fdd6054d
* Refactor
...
* Break out common BasicDOSProtector code into separate class.
2013-10-07 23:19:50 -05:00
f76cc6036e
* Added a Basic DOS protection container/base object for the most common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler
...
* Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice.
* Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers
* Added CircularBuffer, used for CPU and Memory friendly rate monitoring.
* DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
2013-10-07 21:35:55 -05:00
9800c6fa6c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2013-10-06 18:33:49 +01:00
69054ad134
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-10-06 18:32:20 +01:00
ece2d24077
* Fixes cases where Last Attachment Point gets overwritten with 0 when it shouldn't
...
* Fixes cases where Last Attachment Point doesn't get written when it should.
* Fixes Null Reference in BaseHttpServer when shutting down, null path provided.
* Drop then Wear retains Last Attachment Point
2013-10-05 17:36:58 -05:00
31246ecd04
* Added a unique and interesting WebSocket grid login processor by hijacking the LLSD login code. This sends the data through the normal login channels and spits out a JSON object back that mimics the login response. Feel free to comment on the best way to set this up as a config option.
2013-10-04 20:53:01 -05:00
85593d8d25
* Add an initial complete frame timeout to the WebSocket processor to make it easier to write WebSocket service code that is resistant to Denial of Service attacks.
2013-10-04 20:37:59 -05:00
083eb7679b
Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range, shout-range, at the request of Singularity dev Liru-Dargon
2013-10-04 17:32:17 -07:00
44580e2233
Update an AssmblyVersion property that I missed to 0.8.0
2013-10-04 23:36:28 +01:00
42bdf44658
Bump OPenSimulator version and assembly versions up to 0.8.0 Dev
2013-10-04 23:33:47 +01:00
28d704599e
Merge branch 'master' of careminster:/var/git/careminster
2013-10-04 16:52:55 -05:00
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
970249a3c7
Add OnChatToNPC and OnInstantMessageToNPC messages to NPCAvatar to allow region modules to directly subscribe to chat and messages received by NPCs
...
Currently still requires INPC from NPCModule.GetNPC() to be cast to an NPCAvatar.
2013-10-04 19:40:43 +01:00
8996ac1a9c
minor: Disable logging left active on regression test TestSameSimulatorIsolatedRegionsV2()
2013-09-27 22:33:42 +01:00
2cd95fac73
refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in the code that this is symmetric with CloseAgent()
2013-09-27 22:27:39 +01:00
b16bc7b01c
refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly.
...
Adds IScene.CloseAgent() to replace RemoveClient()
2013-09-27 19:14:21 +01:00
b704de9bf8
minor code formatting for the sake of consistency and readability
2013-09-26 16:27:11 -07:00
d6d82dbd3c
minor: correct attachment spelling mistake in log message in HGEntityTransferModule.OnIncomingSceneObject()
2013-09-26 20:13:29 +01:00
e24edada24
minor: Comment out windlight log message about sending scene data for now.
2013-09-26 00:39:32 +01:00
253f8de8cd
minor: Add scene name to baked textures in cache log message
2013-09-26 00:33:50 +01:00
babfbe8d6d
minor: log MaxOutgoingTransferVersion at EntityTransferModule startup
2013-09-26 00:31:33 +01:00
4664090b34
minor: correct spelling of Initialized in LSC connector version message
2013-09-25 22:59:57 +01:00
b22c92368f
Move adding UUID.Zero -> Unknown User binding to UMM.Init() so that it's also called by HGUserManagementModule
2013-09-25 21:53:38 +01:00
32ddfc2740
Reinsert client.SceneAgent checks into LLUDPServer.HandleCompleteMovementIntoRegion() to fix race condition regression in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100)
...
This check is necessary to close a race condition where the CompleteAgentMovement processing could proceed when the UseCircuitCode thread had added the client to the client manager but before the ScenePresence had registered to process the CompleteAgentMovement message.
This is most probably why the message appeared to get lost on a proportion of entity transfers.
A better long term solution may be to set the IClientAPI.SceneAgent property before the client is added to the manager.
2013-09-25 18:45:56 +01:00
732554be04
Reinsert 200ms sleep accidentally removed in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100)
2013-09-25 18:29:14 +01:00
f384a6291e
Instead of swallowing any socket begin/end receive exceptions, log them for debugging purposes.
...
This may reveal why on some teleports with current code, the UseCircuitCode message gets through but CompleteMovement disappears into the ether.
2013-09-25 00:02:17 +01:00
7889e7757a
Don't use 'Indented' formatting for RpcXml responses.
...
(cherry picked from commit 93abcde69043b175071e0bb752538d9730433f1d)
2013-09-22 21:10:01 -05:00
2dc92e7de1
Preserve attachment point & position when attachment is rezzed in world
...
Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.
Fixed to apply to r/23314 commit
ba9daf849e
2013-09-22 21:10:01 -05:00
a37c59b43e
minor: Recomment out log message uncommented in previous cbdfe969
2013-09-21 00:40:23 +01:00
cbdfe96905
When giving items between avatars in different simulators, only add the item to the receiving avatar's inventory once.
...
When a user gives an item, the user's client sends an InventoryOffered IM message to its simulator. This adds the item to the receiver's inventory. If the receiver isn't in the same simulator then XMLRPC is used to forward the IM to the correct simulator. The bug was that the receiving simulator handled the message by calling OnInstantMessage() again, which added a second copy of the item to the inventory. Instead, the receiving simulator should only notify the avatar that the item was offered.
2013-09-21 00:32:56 +01:00
4c0ec86176
minor: Add prefix to log message in LureModule
2013-09-21 00:14:57 +01:00
e2b3b7a2ae
minor: Correct minor spelling mistake Reseting -> Resetting in HG Map module log message
2013-09-20 23:42:55 +01:00
8502517d80
Make UUID.Zero resolve to "Unknown User" in user cache.
...
This is to avoid massive numbers of 'no user found' logs when user IDs are missing for some reason.
UUID.Zero should not be used for any user ID.
2013-09-20 23:07:24 +01:00
c01db5fbdd
Lock around read/write of ScenePresence.m_originRegionID to make sure that all threads are seeing the latest value and not a cached one.
...
There is a possibilty that some V2 teleport failures are due to the viewer triggered CompleteMovement thread not seeing the change of m_originRegionID by the UpdateAgent thread.
2013-09-20 22:41:53 +01:00
c6dea6ee78
Change some message log levels in Scene.IncomingUpdateChildAgent() for debugging purposes
2013-09-20 20:19:44 +01:00
35a6361b24
BulletSim: reduce avatar walking stopped threshold.
...
Add parameter for setting the walking stopped threshold.
This fixes the slight jump when an avatar stops walking.
2013-09-20 09:58:45 -07:00
07d7a5fd76
BulletSim: zero velocity when avatar not moving.
...
This fixes a movement jitter that happens when an avatar is standing on a
tilted surface.
2013-09-20 09:58:25 -07:00
c06a9ffe5c
Make new regions PG by default instead of Mature.
...
This makes scripted object sounds and a few other things play by default instead of having to switch the viewer to adult
This reduces the support burden
2013-09-20 00:04:33 +01:00
f1267730ef
UUID Gatherer: find assets used in Light Projection, Particle Systems, and Collision Sounds.
2013-09-19 23:01:06 +01:00
979b17165b
For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 teleport protocol even if SIMULATION/0.2 is available.
...
This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details.
Default remains "SIMULATION/0.2"
Primarily for http://opensimulator.org/mantis/view.php?id=6755
2013-09-19 22:45:50 +01:00
b6f10780c2
minor: Make SP.MakeRootAgent() private - no external code has any business calling this method
2013-09-19 21:44:30 +01:00
03b2b5b77b
minor: Make log message at top of ScenePresence.CompleteMovement info level and comment out later log message in ScenePresence.MakeRootAgent()
...
Need an info message since this is currently important in detecting teleport issue when not at debug log level.
CompleteMovement message occurs before MakeRootAgent() one did
2013-09-19 20:59:27 +01:00
6bdef1f70b
minor: Stop debug logging whenever an npc is moved, other npc log related formatting cleanups
2013-09-19 20:49:55 +01:00
3a9a8d2113
Revert "Also check user authorization if looking to upgrade from a child to a root agent."
...
This reverts commit c7ded0618c
2013-09-19 20:26:26 +01:00
83c113896e
Create regression TestCrossOnSameSimulatorNoRootDestPerm() to check that avatars are not allowed to cross into a neighbour where they are not authorized, even if a child agent was allowed.
2013-09-19 20:26:08 +01:00
8ad7f2ce2d
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2013-09-19 11:33:38 +01:00
8999f06025
minor: correct method name in comment
2013-09-18 23:13:31 +01:00
ddcbd4bb7d
refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()
...
verb-noun is consistent with other similar methods
2013-09-18 23:09:38 +01:00
3ce46adb2a
minor: Make log message when Scene.IncomingChildAgentDateUpdate() more explicit that there is a problem if it still finds the agent to be a child if the sender wanted to wait till it became root
...
Add some comments about the mssage sequence, though much more data is at
http://opensimulator.org/wiki/Teleports
2013-09-18 22:56:00 +01:00
f4d82a56f4
Double the time spent waiting for a UseCircuitCode packet in LLUDPServer.HandleCompleteMovementIntoRegion()
...
This is to deal with one aspect of http://opensimulator.org/mantis/view.php?id=6755
With the V2 teleport arrangements, viewers appear to send the single UseCircuitCode and CompleteAgentMovement packets immediately after each other
Possibly, on occasion a poor network might drop the initial UseCircuitCode packet and by the time it retries, the CompleteAgementMovement has timed out and the teleport fails.
There's no apparant harm in doubling the wait time (most times only one wait will be performed) so trying this.
2013-09-18 22:09:46 +01:00
7dbc93c62a
Change logging to provide more information on LLUDPServer.HandleCompleteMovementIntoRegion()
...
Add more information on which endpoint sent the packet when we have to wait and if we end up dropping the packet
Only check if the client is active - other checks are redundant since they can only failed if IsActve = false
2013-09-18 21:41:51 +01:00
1d2466889a
Reinstate insertion of "Unknown UserUMMAU4" now, as naive removing may be generating too many repeating user requests from other sources.
...
Leaves in the dropping of the client GUN8 (now 9) uuid binding message, since this was the much more common case from the viewer-side and this can only affect viewers.
2013-09-17 01:20:55 +01:00
845d2b193a
Comment out warning about no grid user found in UMM.TryGetUserNamesFromServices() for now
2013-09-17 00:54:53 +01:00
69ec85f491
Fix issue in recent 3f0fa9f7 where the code start adding unknown user cache entries with no name
2013-09-17 00:02:36 +01:00
2603a2891b
Reinsert comments about possible race conditions when sending bulk inventory updates on non-flag clothing editing
2013-09-16 23:26:13 +01:00
f99dae03cb
Fix bug where using PRIM_LINK_TARGET with only two remaining list items (e.g. link number then PRIM_ROTATION) would not return the parameter
...
Extended regression test for this case
2013-09-16 23:00:40 +01:00
60cf42cb8d
Make llGetLinkPrimitiveParams() abort and return existing list of params when it encounters an invalid link number, rather than throwing an exception
...
Addresses http://opensimulator.org/mantis/view.php?id=6768
Thanks to talun for the patch on that commit - in the end I took a different approach that also deals with invalid PRIM_LINK_TARGET
However, not yet generating the same warning on invalid PRIM_LINK_TARGET as seen on LL grid
This commit also adds regression tests for some cases of llGetLinkPrimitiveParams()
2013-09-16 22:56:08 +01:00
c4b0f172a1
Merge branch 'master' of careminster:/var/git/careminster
2013-09-16 16:49:46 -05:00
72206a0e29
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
2013-09-16 22:32:53 +01:00
3f0fa9f707
To avoid viewers (particularly on the Hypergrid) from permanently caching a UUID -> "Unknown User" binding, drop the binding request rather than replying with "Unknown User"
...
By not binding UUID -> "Unknown User", we leave open the possibility that the binding may be correctly resolved at a later time, which can still happen in some Hypergrid situations.
Observed behaviour of LL viewer 3.3.4 is that a dropped bind request is not retried until the next session.
2013-09-16 19:45:42 +01:00
120b6948ed
* This fixes the border crossing offsets by storing the final keyframe location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper.
...
(cherry picked from commit e0399ccaec
2013-09-16 11:32:05 -05:00
1c7accf950
* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.
...
* Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
(cherry picked from commit 01c3be2746
2013-09-16 11:32:05 -05:00
07d6a0385f
6762: llList2Key fails to convert a string in a list to a key
...
llGetPrimitiveParams changed to return the sculpty key as an LSL_String so
that type checking in llList2Key will work
2013-09-12 23:23:52 +01:00
3c85afbb43
Allow setting the EntityTransfer-max_distance to 0 to override distance checks. This is to facilitate current viewer work fixing the distance limitations for teleporting.
2013-09-12 11:46:12 -04:00
dacc20ee48
BulletSim: remove collision cache clearing logic for physical objects.
...
This fixes constraints from getting messed up when properties change.
2013-09-11 16:50:27 -07:00
b29e9d37e7
Change handling of the FetchInventoryDescendents2 capability configuration to allow
...
for external handlers.
2013-09-11 12:15:16 -07:00
6e39cc316f
BulletSim: add ClearCollisionProxyCache function to API.
...
Add proxy cache clearing when some properties are changed. This fixes
a problem where objects would stop colliding of they were moved
with setPosition mulitple times.
2013-09-11 09:12:24 -07:00
c5eabb28b4
BulletSim: add LSL function and plumbing for setting a spring
...
equilibrium point in the physics engine constraint.
2013-09-11 09:12:19 -07:00
5827b6e1aa
BulletSim: add extended physics LSL constants for axis specification.
...
Add specific error warnings for mis-matched parameter types in extended
physics functions.
2013-09-11 09:12:18 -07:00
cf2cdc191d
BulletSim: ability to specify groups of axis to modify in constraint parameters that control multiple axis. Add useLinearReferenceFrameA constraint parameter.
2013-09-11 09:12:16 -07:00
7c54630a2d
BulletSim: add axis parameter for specifying enable, damping, and stiffness for spring constraints. Renumber parameter ops since I can as no one is using them yet.
2013-09-11 09:12:14 -07:00
30b3657a66
BulletSim: implementation of setting spring specific physical parameters. Add setting of linkset type to physChangeLinkParams. Lots of detail logging for setting of linkset constraint parameters.
2013-09-11 09:12:12 -07:00
67195618d5
BulletSim: add requestor's ID to post taint detail log message.
2013-09-11 09:12:10 -07:00
3dbf4a1002
BulletSim: remove chatty debug message from previous commit.
2013-09-11 09:12:09 -07:00
e0b457d3c3
BulletSim: add position and rotation update for child prim physics update events. Normally, physics engines do not return updates for child prims so, under normal operation, this code should never execute. Will only be used when using flexible linkset linkages.
2013-09-11 09:12:07 -07:00
d09c35f506
BulletSim: pass both root and child BSPhysObjects to Extension function. Update routines to use the new parameters list from above change.
2013-09-11 09:12:05 -07:00
995314f91f
BulletSim: add ID parameter to TaintedObject calls so logging will include LocalID of object which created the taint.
2013-09-11 09:12:03 -07:00
4781297b4e
BulletSim: Extension parameters passed through the classes made to pass just and array of objects rather than a mixture of parameters and array. Makes understanding and parsing what is being passed much easier.
2013-09-11 09:12:02 -07:00
6d83f3f021
BulletSim: adjust avatar capsule height calculation to be closer to defined SL heights. Correct BSParam avatar height defaults to be what's in OpenSimDefaults.ini.
2013-09-11 09:12:00 -07:00
e1120cb74d
BulletSim: add extended physics function physGetLinkType(linkNum). Add implementation of physChangeLinkParams() in BSLinksetConstraint.
2013-09-11 09:11:58 -07:00
f6fdfd16f5
BulletSim: change ExtendedPhysics constants to 'const' so they can be used as case variables in switch statements.
2013-09-11 09:11:54 -07:00
455d36c4c7
BulletSim: add physChangeLinkParams to set individual parameters on link constraints. Not fully functional. Remove double definition of ExtendedPhysics parameters by having BulletSim reference the optional module (addition to prebuild.xml and usings).
2013-09-11 09:11:52 -07:00
b2a1348adc
BulletSim: update C++ HACD parameters to values that handle enclosed hollow spaces better. This shouldn't affect many since this HACD routine is off by default.
2013-09-11 09:11:50 -07:00
6aee08ac3c
BulletSim: add physChangeLinkSpring to change linkset link to be a spring constraint. Add implementation to create spring constraint. Send up property updates for linkset children at the end of flexible linkset links. The simulator probably doesn't do the right thing yet.
2013-09-11 09:11:48 -07:00
dff0fb5690
BulletSim: Linkset.Refresh() calls internal ScheduleRebuild() to recreate the linkset physics at next PostTaint time. Replace the existing calls to ScheduleRebuild to be calls to Refresh(). This allows external routines to make changes to parameters and then cause the linkset to rebuild.
2013-09-11 09:11:46 -07:00
f3cc20050e
BulletSim: initial implementation of physChangeLinkFixed that resets a linkset's link back to a fixed, non-moving connection.
2013-09-11 09:11:45 -07:00
c6a6631efc
BulletSim: move linkset extension operations into BSPrimLinkable where they should be.
2013-09-11 09:11:43 -07:00
993bcec088
BulletSim: add unmanaged and XNA functions for hinge, slider and spring constraints.
2013-09-11 09:11:41 -07:00
0971c7ae77
BulletSim: complete linkage of spring constraint into linkset constraint.
2013-09-11 09:11:39 -07:00
9a7d0e489c
BulletSim: add spring constraint to linkset constraint types.
2013-09-11 09:11:37 -07:00
48ee73bfa7
BulletSim: add API and calls for spring constraint parameters.
2013-09-11 09:11:36 -07:00
725751fd6c
BulletSim: fixes for change linkset implementation of physical linksets.
2013-09-11 09:11:34 -07:00
b05cb3b2bf
Change collision logic in SceneObjectPart so land_collision will happen.
...
The previous logic would generate land_collision_start and land_collision_end
but would not generate the land_collision itself.
2013-09-09 14:50:33 -07:00
ddf67bf929
Mono 2.0 fix - call ToArray() explicitly
2013-09-08 19:41:51 +02:00
528fc5358d
Fix exception when brokering HG asset ids
2013-09-08 18:23:06 +02:00
b41ae0f98f
Harmonize the class name, ID and Name of the default perms module
2013-09-08 17:54:00 +02:00
59290854f2
Reinstate SecurePermissionsLoading functionality, default ON
2013-09-08 17:53:21 +02:00
a97f6f8668
Fix configuration/ini expansion issue. Thanks to smxy for testing.
2013-09-07 13:11:31 -04:00
844ae7720e
Bring Core Groups up to current version
2013-09-07 17:58:32 +02:00
66715a69a7
Add two argument constructor to GridInstantMessage
2013-09-07 17:57:53 +02:00
823e8b5d19
Add support for simple external CAPS texture services
2013-09-07 17:57:02 +02:00
2f365ea80b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-09-07 13:54:19 +01:00
04619a9b13
Restore group membership check for HG users in QueryAccess.
2013-09-05 07:44:27 -07:00
dc74a50225
Stop "show client stats" from throwing an exception if somehow Scene.m_clientManager still retains a reference to a dead client.
...
Instead, "show client stats" now prints "Off!" so that exception is not thrown and we know which entries in ClientManager are in this state.
There's a race condition which could trigger this, but the window is extremely short and exceptions would not be thrown consistently (which is the behaviour observed).
It should otherwise be impossible for this condition to occur, so there may be a weakness in client manager IClientAPI removal.
2013-09-04 23:48:24 +01:00
c7ded0618c
Also check user authorization if looking to upgrade from a child to a root agent.
...
Relevant if a child agent has been allowed into the region which should not be upgraded to a root agent.
2013-09-04 00:44:17 +01:00
5f0d54c209
For a Hypergrid user, delay estate access checks until NewUserConnection() so that they work.
...
This is necessary because the hypergrid groups checks (as referenced by estates) require an agent circuit to be present to construct the hypergrid ID.
However, this is not around until Scene.NewUserConnection(), as called by CreateAgent() in EntityTransferModule.
Therefore, if we're dealing with a hypergrid user, delay the check until NewUserConnection()/CreateAgent()
The entity transfer impact should be minimal since CreateAgent() is the next significant call after NewUserConnection()
However, to preserve the accuracy of query access we will only relax the check for HG users.
2013-09-04 00:42:23 +01:00
b781a23c44
In pCampbot PhysicsBehaviour.Close(), only cancel jumping if bot is connected
2013-09-03 19:58:27 +01:00
9c3c9b7f5f
Make pCampbot "add behaviour" and "remove behaviour" console commands work for all bots if no bot number is given
2013-09-03 19:57:34 +01:00
76bd2e2d72
Consistently give responsibility for thread sleeping to behaviours rather than controlling from the main action loop
...
This is to avoid excessive and inconsistent delays between behaviours that currently need to embed sleeps in other actions (e.g. physics) and other behaviours.
Might need a more sophisticated approach in the long term.
2013-09-03 19:41:12 +01:00
3dbe7313d1
Add Close() method to IBehaviour to allow behaviours to cleanup when removed or bot it disconnected.
...
In this case, it is used to turn off jump when physics testing behaviour is removed.
2013-09-03 19:33:17 +01:00
1a2627031d
Add pCampbot "remove behaviour" console command for removing bot behaviours during operation.
...
Doesn't currently work very well as stopping physics, for instance, can leave bot travelling in old direction
2013-09-03 19:05:54 +01:00
9bd6271570
Add ability to adjust pCampbot bot behaviours whilst running with "add behaviour <behaviour-name> <bot-number>" console commad
2013-09-03 18:51:55 +01:00
01cb8033a4
And fix break in "show bot" from commit 9c65207
2013-09-03 17:55:20 +01:00
a89c56dcf1
Fix build break from last commit 9c65207. Mono 2.4 lacks string.join(string, List<string>), or some auto casting is missing
2013-09-03 17:53:29 +01:00
9c65207936
Show behaviours of pCampbot bots in "show bots" and "show bot" console commands
2013-09-03 17:07:57 +01:00
431156f6c4
minor simplification of some unix date functions in Util. No functional change.
2013-09-03 00:17:50 +01:00
5f15ee95dc
Fix logic errors in "show grid users online" console command which didn't actually filter out users shown continuously online for more than 5 days
...
Remove confusion in command output.
2013-09-03 00:16:43 +01:00
fc9f50d940
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-09-03 00:06:50 +01:00
4035badd20
Add experimental "show grid users online" console command to show grid users online from a standalone/robust instance.
...
This is not guaranteed to be accurate since users may be left "online" in certain situations.
For example, if a simulator crashes and they never login/logout again.
To counter this somewhat, only users continuously online for less than 5 days are shown.
2013-09-03 00:04:12 +01:00
9643915093
Remove test that gives issue on Windows, just let the try/catch do the work.
2013-09-02 16:28:40 -04:00
857f24a5e2
Fix bug where users teleporting to non-neighbour regions could continue to hear chat from their source region for some time after teleport completion.
...
This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat.
This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running.
This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
2013-09-02 19:15:10 +01:00
5ce5ce6edb
Comment out warning about agent updating without valid session ID for now.
...
This causes extreme console spam if a simulator running latest master and one running 0.7.5 have adjacent regions occupied by avatars.
2013-09-02 17:45:38 +01:00
4cbadc3c49
Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.
...
This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
2013-09-02 17:27:45 +01:00
008c98a974
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-09-01 22:49:31 +01:00
56f565b601
Profiles: Clean up some log entries caused when visiting HG avatar is using legacy profiles
2013-08-29 16:54:13 -04:00
a8c0e16e47
Initialization: move key expansion out to operate on all sources and not just environment variables
2013-08-29 14:35:56 -04:00
aa521fb385
Do not add a port zero to end of the hypergrid gateway host name.
...
If the port is specified it is added but a ":0" is not added if the port is zero.
This enables the hypergrid address short form "hypergridGateway:regionName"
which is handled by the parser but failed because of this zero port addition.
2013-08-28 16:38:07 -07:00
0882cf0fc3
BulletSim: add some protections for processing when shutting down.
...
Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740 ).
2013-08-27 09:55:50 -07:00
0dd9a68eb7
Revert "Make HG logins fall back to fallback regions if the desired region fails."
...
This is very similar to my earlier revert in bcb8605f84c7a8afbb8d
2013-08-26 21:07:49 +01:00
1b2830b929
Revert "Added some more debug messages."
...
Fallback doesn't work at this level as the change of destination isn't communicated to the source region/viewer
Reverting because this introduces a bug when access does fail.
More detail in revert of main commit.
This reverts commit ec32c1d4b6
2013-08-26 21:05:55 +01:00
60e4ce20b8
Fix exception thrown after a region has been restarted through scheduling.
...
This exception was very likely harmless since it occurred after the restart had taken place, but still misleading.
Thanks to SCGreyWolf for the code change suggestion in http://opensimulator.org/mantis/view.php?id=6747 , though I did this in a slightly different way.
2013-08-25 20:17:04 +01:00
85824d2cd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-25 20:12:59 +01:00
f7378829c3
Fix the root cause of keyframe motion region crossing offset - UpdateSceneObject
...
was being called twice on each crossing.
2013-08-25 06:26:56 +02:00
e0399ccaec
* This fixes the border crossing offsets by storing the final keyframe location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper.
2013-08-24 18:55:21 -05:00
ec32c1d4b6
Added some more debug messages.
2013-08-24 09:59:05 -07:00
f0c0376660
Potential fix for access control bug on login introduced with SeeIntoRegion commit.
2013-08-24 08:42:41 -07:00
01c3be2746
* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.
...
* Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
2013-08-24 05:55:53 -05:00
58359788a9
Revert "* This increases accuracy when border crossing (the reason is.. the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop."
...
This reverts commit 55400ff7be
2013-08-24 05:54:08 -05:00
5cd7bc2848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-24 03:42:39 -07:00
c7a8afbb8d
Make HG logins fall back to fallback regions if the desired region fails.
2013-08-24 03:41:56 -07:00
c34e6f25b1
Fix a printing of exception error in InventoryArchiveModule that only
...
printed the error message and not the call stack.
2013-08-23 13:53:47 -07:00
1a623bb266
Rename pCampbot.ini -> pCampBot.ini (and example file) to be consistent with other capitalizations of pCampBot
2013-08-23 20:58:46 +01:00
55400ff7be
* This increases accuracy when border crossing (the reason is.. the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop.
2013-08-23 00:28:36 -05:00
0fbfef9649
minor: shortern warning messages in EntityTransferModule when UpdateAgent() fails
2013-08-23 01:21:03 +01:00
050617ae0e
Make pCampbot "show bot" command take the bot number instead of the full bot name
...
Shorter and can do this because bot names are uniform
2013-08-23 01:13:19 +01:00
04f4dd3dc7
remove redundant return at end of HandleDeregisterRegion()
2013-08-23 01:04:03 +01:00
2be786709b
Make it possible for the "deregister region id" command to accept more than one id
2013-08-23 01:03:27 +01:00
61c20bd06a
Remove old and unused ScenePresence.RestoreInCurrentScene()
2013-08-23 00:53:42 +01:00
065c5839b5
Refactor: merge SceneGraph.AddScenePresence() into CreateAndAddChildScenePresence() since the former was only ever called from the latter
...
This allows us to remove dead code relating to adding root agents directly to the scenegraph, which never happens.
2013-08-23 00:49:13 +01:00
a9f9b0da9d
minor: Correct typo on "debug stats record start" message
2013-08-23 00:13:31 +01:00
a0c99a7dcc
minor: remove mono compiler warning from LLClientView
2013-08-23 00:03:47 +01:00
13556cf129
Fix a further bug in pCampbot connect where ignoring already connected bots was wrongly counted as a connect
...
Also, only sleep when we actually perform a connection
2013-08-22 23:49:19 +01:00
70f89ae65b
Make it possible to adjust the pCampbot login delay via the [BotManager] LoginDelay parameter of pCampbot.ini
2013-08-22 23:43:33 +01:00
51c7fb1969
Add "set bots" command to make it possible to set SEND_AGENT_UPDATES on all bots whilst pCampbot is running
2013-08-22 23:11:05 +01:00
beb9d966f9
Stop "handle sit user name" command from trying to sit avatars on objects which have sit positions but are attachments
2013-08-22 22:49:23 +01:00
416bbe9583
Stop error messages being misleadingly generated when on client connection activity timeout, a root connection triggers a CloseAgent to a neighbour region which has already closed the agent due to inactivity.
...
Also separates out log messages to distinguish between close not finding an agent and wrong auth token, and downgrades former to debug and latter to warn
2013-08-22 22:46:40 +01:00
66a7dc3a0d
In pCampbot, don't try and reconnect bots that are already connected on console "connect" command
2013-08-22 20:12:14 +01:00
832c35d4d5
Stop "sit user name" and "stand user name" console commands from trying to sit/stand avatars already sitting/standing
2013-08-22 20:05:57 +01:00
689cf2d367
minor: Make logging in GatekeeperService.LoginAgent() a bit more detailed so that we can distinguish between simultaneous logins
2013-08-22 01:24:55 +01:00
bcb8605f84
Revert "Implement ability for hg logins to try fallback regions just like local logins."
...
This approach does not work - it is taking place too far down the login process where really the region checking
could only be done when the hg map tiles are linked on the main map (messy and probably impossible) or possibly
when the final destination is fetched at the very first stage of teleport (which couldn't be done without a protocol
change to pass the agentID as well as the requested regionID)
This reverts commit 3d9b73c47a
2013-08-22 01:20:01 +01:00
3d9b73c47a
Implement ability for hg logins to try fallback regions just like local logins.
...
These would be specified in the [GridService] section of Robust.HG.ini, which already lists these in the example text.
Untested patch so that Neb can easily pull in for testing, though shouldn't disrupt existing hg logins since fallback processing is a bit of code stuck on the end of the login sequence.
2013-08-21 23:19:31 +01:00
1f39a763a5
Don't allow users to attempt to sit on objects in a child region without going to that region first.
...
If this is attempted, they get a "Try moving closer. Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid.
Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
2013-08-21 21:35:03 +01:00
a6af561660
* Fix some threading issues in BulletXNA (the managed bullet library), this should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs.
...
* Fixed a null ref during shutdown.
2013-08-20 21:09:17 -05:00
4a81465b91
Fix build break from last commit a3e1b27 on mono 2.4.3
...
Looks like this level of mono doesn't have a string.Join() which will take a list rather than an array (or some implicit conversion isn't happening)
2013-08-20 18:47:52 +01:00
a3e1b278a1
Add pCampbot "show bot" console command to show more detailed information on a particular bot (e.g. what sims they are connected to)
2013-08-20 18:41:09 +01:00
43940f6562
Add --regex options to "sit user name" and "stand user name" console commands to sit/stand many avatars at once.
...
Currently, first name and last name are input separate but are concatenated with a space in the middle to form a regex.
So to sit all bots with the first name "ima", for instance, the command is "sit user name --regex ima .*"
2013-08-20 18:13:40 +01:00
e384ff604e
Add experimental "sit user name" and "stand user name" console commands in SitStandCommandsModule.
...
"sit user name" will currently only sit the given avatar on prims which have a sit target set and are not already sat upon.
Chiefly for debug purposes.
2013-08-20 17:43:02 +01:00
56d1d67a34
Add pCampbot console commands to sit all bots on ground and stand all bots
2013-08-20 17:01:12 +01:00
a3dd7db4a3
Add -connect (-c) switch to pCampbot command line options.
...
Now, bots will only connect at startup if this switch is specified.
If it is not specified, then a separate "connect" command is required on the pCampbot command line
2013-08-20 00:08:47 +01:00
589b1a2eaf
Make it possible to reconnect pCampbots with the console command "connect [<n>]".
...
If no n is given then all available bots are connected
2013-08-19 23:50:18 +01:00
ea3f024b8a
refactor: start bot connection thread within BotManager rather than externally
2013-08-19 21:25:17 +01:00
079cd4e94f
refactor: restructure pCampbot multi-bot connection code.
2013-08-19 21:17:59 +01:00
2fa42f24fd
Make it possible to disconnected a specified number of bots via the pCampbot console command "disconnect [<n>]"
...
Bots disconnected are ascending from last in numeric order.
Temporarily no way to reconnect bots.
2013-08-19 21:00:31 +01:00
49b7cbda72
Create a separate pCampbot "disconnect" console command which disconnects connected bots.
...
"quit" console command now requires bots to be separate disconnected first before quitting.
This is to prepare the way for disconnecting/reconnecting different numbers of bots in a pCampbot session.
And hopefully resolves bug where console appears not to be reset if Environment.Exit(0) is called on a different thread
2013-08-19 20:29:17 +01:00
ef63abe9b1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-19 20:00:42 +01:00
a90a5f52dd
Show number of connections each bot has established in "show bots" command.
2013-08-19 19:38:20 +01:00
aa7f4215a9
Merge branch 'master' into careminster
2013-08-18 03:00:32 +01:00
3585b0a139
Allow updating the wearable type of wearables that have a type of 0.
...
This will allow viewers to fix broken wearables as they detect them.
2013-08-18 02:59:10 +01:00
bef03fb30b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
2013-08-17 03:23:45 +01:00
85a9cb260a
Remove mono compiler warnings from UserProfilesModule
2013-08-17 01:10:58 +01:00
d75f00cc2d
minor: remove mono compiler warning from AttachmentsModule
2013-08-17 01:09:31 +01:00
b3052c425e
Remove some mono compiler warnings from OpenSim/Server/Handlers
2013-08-17 01:08:19 +01:00
f5dbfe99b1
minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGrid
2013-08-17 01:06:48 +01:00
d38d5ecbac
minor: remove mono compiler warnings from ScenePresence
2013-08-17 01:00:20 +01:00
77d418a36d
remove mono compiler warnings from PollServiceRequestManager
2013-08-17 00:56:19 +01:00
217c8deae5
minor: remove mono compiler warning in StatsManager
2013-08-17 00:51:21 +01:00
1f1736a79f
minor: Make log messages consistent in NeighbourServicesConnector
2013-08-17 00:46:18 +01:00
14ae89dbe7
Fix issues with RemoteAdmin admin_save_heightmap and admin_load_heightmap not working.
...
This is because they were wrongly looking for both regionid and region_id parameters in the same request.
Now only region_id is required (and recognized), regionid having been already deprecated for some time.
This is essentially Michelle Argus' patch from http://opensimulator.org/mantis/view.php?id=6737 but with tabs replaced with spaces.
Thanks!
2013-08-17 00:39:41 +01:00
f5d3145bea
Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() regression test for v2 transfers.
...
Also adjusts names of teleport setup helpers in EntityTransferHelpers
2013-08-17 00:24:56 +01:00
fbab898f74
Add TestSameSimulatorNeighbouringRegionsV2() regression test for v2 entity transfer protocl
2013-08-16 23:52:55 +01:00
1624522761
refactor: Make AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTeleportV2 use already available TestClient handle rather than retrieving it via the ScenePresence
2013-08-16 23:45:04 +01:00
7d268912f1
Packet headers are not zero-encoded so don't try to zero-decode these in PacketPool.GetType()
...
Instead adjusts code with that from Packet.BuildHeader(byte[], ref int, ref int):Header in libomv
This stops packet decoding failures with agent UUIDs that contain 00 in their earlier parts (e.g. b0b0b0b0-0000-0000-0000-000000000211)
Thanks to lkalif for pointing this out.
2013-08-16 00:58:25 +01:00
7c916ab91c
Try to make "slow down" message that one could receive on rapid teleporting more informative to the user.
...
This message is seen on V2 if one attempts to quickly re-teleport from a source region where one had previously teleported to a non-neighbour and back within 15 secs.
The solution here is for the user to wait a short while.
This message can also be seen on any teleport protocol if one recieves multiple teleport attempts simultaneously. Probably still useful here to help identify misbehaving scripts.
2013-08-15 14:51:54 +01:00
3ddb7438d7
Move DoNotCloseAfterTeleport flag reset before UpdateAgent in V2 to avoid a low probability where the destination re-establishing the child connection before the flag was reset
2013-08-15 14:41:00 +01:00
3f8d79024b
Rely on the Scene.IncomingCloseAgent() check as to whether the connection should be kept open after teleport-end rather than doing this in the ET Module
...
This is safer since the close check in IncomingCloseAgent() is done under lock conditions, which prevents a race between ETM and Scene.AddClient()
2013-08-15 14:07:57 +01:00
2231fcf5b4
Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections.
...
This approach has problems if a client quits without sending a proper logout but then reconnects before the connection is closed due to inactivity.
In this case, the DoNotCloseAfterTeleport was wrongly set.
The simplest approach is to close child agents on teleport as quickly as possible so that races are very unlikely to occur
Hence, this code now closes child agents as the first action after a sucessful teleport.
2013-08-15 13:46:46 +01:00
5011c657b5
Actually implement the bot request object textures switch started in 225cf0d.
...
Forgot to propogate it down to bot level.
2013-08-14 23:37:07 +01:00
104626d732
minor: Comment out AvatarPicketSearch caps log message for now, which is occuring on every login and entity transfer
2013-08-14 23:22:52 +01:00
73e3ca670d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-14 23:21:51 +01:00
60cc9e9a3c
minor: remove unused entity transfer config in teleport v2 attachments test
2013-08-14 23:21:18 +01:00
e8b1e91a1d
BulletSim: include check for volume detect in check for zeroing avatar motion.
...
Normally, avatar motion is zeroed if colliding with a stationary object so
they don't slide down hills and such. Without volume detect check this also
allowed avatars to stand on volume detect objects and to have some jiggling
when they were in the volume detect object. This commit fixes both.
2013-08-14 14:49:24 -07:00
7c3b71d294
BulletSim: add physical object initialized flag so updates and collisions
...
don't happen until the object is completely initialized.
This fixes the problem of doing a teleport while the simulator is running.
The destruction of the physical object while the engine is running means
that the physics parameter update would overwrite the new position of the
newly created avatar.
2013-08-14 14:49:22 -07:00
93dffe1777
Add stat clientstack.<scene>.IncomingPacketsOrphanedCount to record well-formed packets that were not initial connection packets and could not be associated with a connected viewer.
2013-08-14 22:33:12 +01:00
0d5680e971
Count any incoming packet that could not be recognized as an LLUDP packet as a malformed packet. Record this as stat clientstack.<scene>.IncomingPacketsMalformedCount
...
Used to detect if a simulator is receiving significant junk UDP
Decimates the number of packets between which a warning is logged and prints the IP source of the last malformed packet when logging
2013-08-14 22:08:28 +01:00
df7a1e68f6
Merge branch 'master' into careminster
2013-08-14 21:25:22 +01:00
2c67aa0f41
If pCampbot has been asked to shutdown, don't carry on logging in queued bots
2013-08-14 21:08:00 +01:00
225cf0d010
Add pCampbot RequestObjectTextures ini setting to control whether textures are requested for received objects.
2013-08-14 19:53:10 +01:00
fd519748e9
Add method doc to Scene.RemoveClient() to ask any callers to use Scene.IncomingCloseAgent() instead.
...
IncomingCloseAgent() now sets the scene presence state machine properly, which is necessary to avoid races between multiple sources of close.
Hence, it's also necessary for everyone to consistently call IncomingCloseAgent()
Calling RemoveClient() directly is currently generating an attention-grabbing exception though this right now this is harmless.
2013-08-14 19:36:52 +01:00
97c514daa5
Shutdown a bot's actions by making it check for disconnecting state rather than aborting the thread.
...
Aborting the thread appears to be causing shutdown issues.
2013-08-14 19:21:07 +01:00
3a62f39044
Add a -form switch to pCampbot to allow one to login a sequence of bots starting from numbers other than 0
2013-08-14 18:26:11 +01:00
2146b20169
Add the ability to explicitly specify a login start location to pCampbot via the -start parameter
2013-08-14 16:51:51 +01:00
0feb5da31e
BulletSim: move the creation of the avatar movement actor creating to
...
taint time. Attempt to fix a problem of teleporting within the same
region where the remove and addition of the physical avatar occasionally
ends up with a non-moving avatar.
2013-08-13 21:06:24 -07:00
5933f9448d
Add a SendAgentUpdates setting to a new pCampbot.ini.example file which can control whether bots send agent updates
...
pCampbot.ini.example is used by copying to pCampbot.ini, like other ini files
2013-08-13 23:54:50 +01:00
4a6eff1ee8
Merge branch 'master' into careminster
2013-08-13 22:53:47 +01:00
UbitUmarov