09c2cd0d76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-05-24 00:45:08 +01:00
02fe05f346
Fix issue where llSetPayPrice on either one of a clone prim in the same OpenSimulator session would change the prices on both prims.
...
This is because the PayPrice array refernence was being memberwise cloned and not the array itself.
Addresses http://opensimulator.org/mantis/view.php?id=6639
2013-05-24 00:41:47 +01:00
027580935a
Reset "Show in search" on parcels cut off other parcels that are in search
2013-05-24 01:09:07 +02:00
e597a7d94e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 23:53:44 +01:00
9b56f99326
Fix bug where a cloned object would report the wrong llGetNumberOfPrims() when avatars had been sitting on the original and a different avatar sat on the copy within the same opensim session.
...
This was because the sitting avatars list was being cloned rather than reset.
Addresses http://opensimulator.org/mantis/view.php?id=6649
2013-05-23 23:52:07 +01:00
d90d8e9999
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 15:48:47 -07:00
c5549d2730
add decoder for bounding convex hull
2013-05-23 15:47:47 -07:00
9ba35c6b7e
Port fix from justicc - decouple pay prices on drag-copied prims
2013-05-24 00:45:30 +02:00
0d5566e879
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 23:07:46 +01:00
28548ab347
Fix bug where both ordinary UserManagementModule and HGUserManagementModules were being added to scenes if no UserManagementModule was specified.
...
Without explicit config non-hg UMM is used - this is in common with other HG modules.
This was causing a non-HG module to unpredictably use the UMM or HGUMM, though lack of bug reports suggest either UMM was always used or it didn't matter in this case.
2013-05-23 23:05:56 +01:00
0e002e3693
Add DEBUG level logging in Meshmerizer for mesh parsing. There is
...
a compile time variable to turn this logging off if it is too spammy.
2013-05-23 14:41:05 -07:00
29b3b44fab
BulletSim: add locking around Meshmerizer use to eliminate possible race
...
condition when extracting the convex hulls.
2013-05-23 14:40:16 -07:00
5efce21abc
BulletSim: correct errors caused by misspelled INI parameter spec.
...
Add debugging messages for hull asset use.
2013-05-22 21:57:07 -07:00
f490522082
BulletSim: specify directory for OpenSim.Region.Physics.Meshing
...
DLL file in prebuild.xml since that file ends up in bin/Physics
directory.
2013-05-22 21:09:37 -07:00
ffc9b3dda7
BulletSim: add code to experimentally use asset hull data.
...
Default to 'off' as it needs debugging.
2013-05-22 21:01:00 -07:00
61cdf9390d
BulletSim: fix problem with walking up stairs that are oriented
...
in certain directions. The problem was really that the avatar capsule
orientation was being set incorrectly.
2013-05-22 16:06:06 -07:00
4cb7ee47f2
Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in....
2013-05-22 23:49:34 +02:00
7d38f4940c
Implement llSetSoundQueueing().
...
This is controlled by the viewer, not the server.
So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing , only two sounds can be queued per prim.
You probably need to use llPreloadSound() for best results
2013-05-22 20:01:57 +01:00
6596a1de80
Revert "BulletSim: add code to experimentally use asset hull data."
...
This reverts commit 2fd8819a04
2013-05-21 22:16:18 -07:00
10097f13aa
BulletSim: update DLLs and SOs with version containing gImpact code.
2013-05-21 21:40:26 -07:00
2fd8819a04
BulletSim: add code to experimentally use asset hull data.
...
Default to 'off' as it needs debugging.
2013-05-21 21:32:30 -07:00
9de3979f5b
BulletSim: add gImpact shape type. Add logic to use gImpact shape
...
for prims that have cuts or holes. Default logic to 'off' as it
needs debugging.
2013-05-21 15:32:10 -07:00
ece7b33a96
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-05-21 15:31:13 -07:00
06ab168897
To further help with tracking down the apperance of too much "Unknown User" in chatlogs, etc. temporarily change each instance of this in OpenSimulator so we can identify where it's coming from
...
For instance, the "Unknown User" in Util.ParseUniversalUserIdenitifer becaomes "Unknown UserUPUUI (class initials + method initials)
This is to help with http://opensimulator.org/mantis/view.php?id=6625
2013-05-21 22:26:15 +01:00
ba6a6b2d40
Fix compile failure from recent git master 434c3cf
2013-05-21 18:18:16 +01:00
434c3cf83b
Make "show name" command display HomeURL like "show names"
2013-05-21 18:15:22 +01:00
5c8d38d6cf
minor: Change "show names" command to use consistent console display table
2013-05-21 18:11:07 +01:00
6edecd5d94
Add "show name" console command to make it possible to show a single binding of a UUID to a name.
2013-05-21 18:00:41 +01:00
c47de9878d
Log when "Unknown User" is sent to a user because the UMM had no binding for that UUID and when a binding replaces a previous "Unknown User" entry.
...
This is a temporary measure to hunt down issues where some but not all users see others as "Unknown user" in text chat, etc.
http://opensimulator.org/mantis/view.php?id=6625
2013-05-21 17:45:15 +01:00
6ae426c96b
Lock m_UserCache whilst iterating over it in UserManagementModule.GetUserData() to avoid concurrency exceptions
2013-05-21 17:25:06 +01:00
10e4fb2ce2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-20 09:26:15 -07:00
26904cc5a1
Add comment
2013-05-20 09:25:50 -07:00
e65d1e459e
fix error in hull point indexing
2013-05-18 13:11:22 -07:00
477bee6468
remove duplicate hull scaling
2013-05-18 11:15:05 -07:00
fa8f5bafb2
add prototype code to decode convex hulls from mesh assets. Please do not use yet; the interface will be defined in a later commit.
2013-05-18 01:23:09 -07:00
214bae1479
BulletSim: fix BulletSim crashing if there is no [BulletSim] section
...
in any INI file. Update TODO list.
2013-05-17 21:19:38 -07:00
42c82b564e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2013-05-16 21:59:14 +01:00
ec818a506b
minor: remove long commented out scene cache clearing code in EntityTransferModule.CrossAgentToNewRegionAsync()
2013-05-16 18:26:22 +01:00
61f4ab6674
minor: Remove completely unused IClientAPI.RequestClientInfo() call from EntityTransferModule.CrossAgentToNewRegionAsync()
2013-05-16 18:25:04 +01:00
3bc8cf65a4
Where this is not already happening, trigger asychoronous calls to CloseChildAgent() above the LocalSimulationConnector level.
...
This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes).
No functional change apart from elimination of unnecessary chaining of new threads.
2013-05-16 17:30:30 +01:00
d214e2d0c4
On closing child agents, send separate asynchronous requests to each neighbour rather than sending all closes concurrently on a separate thread.
...
This is to reduce race conditions where neighbours may be responding erratically, thus mixing up create and close agent requests in time.
This mirrors OpenSimulator behaviour on enabling child agents where each region is contacted separately.
2013-05-16 17:12:02 +01:00
bd31821792
On logout, send close child agent requests to neighbours asynchronously, so user is not prevented from relogging if many neighbours are present but not responsive.
...
The symptom here is that previous user connections are still present but are labelled active == false
2013-05-16 16:37:21 +01:00
46eb8465a0
fall back to using a display mesh for physics proxy if no physics_mesh entry was wound in a mesh asset
2013-05-15 17:12:17 -07:00
71a5cc2041
Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686b
2013-05-16 00:07:55 +02:00
12289c4fd1
Removed obsolete libopenmetaverse file
2013-05-16 00:02:28 +02:00
a4290cdbb3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-15 22:06:01 +01:00
177a53fbcf
Fix issue where osMakeNotecard() would fail if given a list containing vectors or quaternions.
...
http://opensimulator.org/mantis/view.php?id=6640
2013-05-15 22:04:38 +01:00
477a5e3a35
* This fixes the avatar stuck in objects on login and teleport by gently applying an upward motion when stuck in things on the Z
...
* Comments describe how it filters out good, normal collisions, from 'stuck' collisions.. It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances.
2013-05-14 20:55:56 -04:00
799ba5aa7b
* Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. This fits within Ubit's framework of multi-body collisions, just moves the reactive force to the Midboxgeom(actual detection) instead of the bigbox geom(pre detection)
2013-05-14 19:17:31 -04:00
23ebae1828
Eliminate race condition where SimStatsReporter starts reporting
...
stats before the region is completely initialized.
2013-05-14 13:40:07 -07:00
Melanie