0f5b616fb0
Didn't mean to commit this change in BlockingQueue.cs
2013-07-17 12:02:00 -07:00
2b8de2c404
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-17 11:19:56 -07:00
e46459ef21
Cleared up much confusion in PollServiceRequestManager. Here's the history:
...
When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle!
This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached.
This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
2013-07-17 11:19:36 -07:00
2c8bf4aaa6
BulletSim: fix small bug where everything looked like it was colliding
...
before the first simulator step.
2013-07-17 10:19:44 -07:00
894554faf6
Removed the MapItems thread. Redirected the map items requests to the services throttle thread. Didn't change anything in how that processor is implemented, for better or for worse.
2013-07-16 20:28:48 -07:00
9432f3c94d
Improvements to the ServiceThrottleModule: added a category and an itemid to the interface, so that duplicate requests aren't enqueued more than once.
2013-07-16 19:04:30 -07:00
5f27aaa6dd
UserManagementModule: in the continuation, call the method that also looks up the cache, because the resource may be here in the meantime
2013-07-16 18:22:42 -07:00
8bad56cb46
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-16 17:53:49 -07:00
d4720bd721
Added config var to fiddle with the Interval for the service throttle thread
2013-07-16 17:53:05 -07:00
9f129938c9
Attachments module only registers when enabled. This enables alternative attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
2013-07-16 17:43:36 -07:00
9f578cf0c8
Deleted a couple of verbose messages
2013-07-16 17:18:11 -07:00
0419852598
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-16 17:15:08 -07:00
a006caabbc
Added IServiceThrottleModule.cs
2013-07-16 17:06:54 -07:00
99a600753e
Changed the name to ServiceThrottle/ServiceThrottleModule in order to reflect its more generic nature.
2013-07-16 17:06:17 -07:00
3fbd2c54bc
Eliminated the UserManagement/UserManagementModule throttle thread. Made the other one generic, taking any continuation.
2013-07-16 17:04:32 -07:00
cbc3576ee2
minor: Add warning method doc about possibly inconsistent results returned from BlockingQueue.Contains(), Count() and GetQueueArray()
2013-07-16 23:14:53 +01:00
50b8ab60f2
Revert "Revert "MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class.""
...
This reverts commit 21a09ad3adhttp://msdn.microsoft.com/en-gb/library/vstudio/system.threading.monitor.exit%28v=vs.100%29.aspx
so this should in theory make no difference, though mono implementation issues could possibly be coming into play.
2013-07-16 23:00:07 +01:00
21a09ad3ad
Revert "MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class."
...
This reverts commit 42e2a0d66e
2013-07-16 22:03:49 +01:00
e0f0b88dec
In the pursuit of using less CPU: now trying to avoid blocking queues altogether. Instead, this uses a timer. No sure if it's better or worse, but worth the try.
2013-07-16 13:01:39 -07:00
6da50d34df
Actually use DoubleQueue in UserManagement/UserManagementModule
2013-07-16 07:19:13 -07:00
5a01ffa515
High CPU hunt: try a different blocking queue, DoubleQueue
2013-07-16 07:15:14 -07:00
6dd454240f
revert last commit which seems to conflict with DoubleQueue internals. The random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc
2013-07-16 02:03:01 -07:00
70aa77f520
add locking to internal queue in WebFetchInvDescModule; lack of which caused a random crash in a load test yesterday
2013-07-16 01:31:09 -07:00
42e2a0d66e
MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class.
2013-07-16 01:12:56 -07:00
e8e073aa97
Simplify EventQueue cap setup so that it is also stat monitored.
...
Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
2013-07-16 00:05:45 +01:00
eb14e5a175
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-15 23:28:02 +01:00
1b7b664c86
Add request received/handling stats for caps which are served by http poll handlers.
...
This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding.
Other refactoring was required to get logic into the right places to support this.
2013-07-15 23:27:46 +01:00
68fbf7eebb
Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"
...
This reverts commit b060ce96d9
2013-07-15 12:34:10 -07:00
687c1a420a
Guard against null ref
2013-07-15 12:33:31 -07:00
b060ce96d9
Puts RequestImage (UDP) back to asyn -- CPU spike hunt
2013-07-15 12:05:31 -07:00
864f15ce4d
Revert the revert
...
Revert "Trying to hunt the CPU spikes recently experienced."
This reverts commit ac73e70293
2013-07-15 11:52:26 -07:00
fbb01bd280
Protect against null requests
2013-07-15 11:37:49 -07:00
ac73e70293
Trying to hunt the CPU spikes recently experienced.
...
Revert "Comment out old inbound UDP throttling hack. This would cause the UDP"
This reverts commit 38e6da5522
2013-07-15 11:27:49 -07:00
60325f81d8
This might address the following observed exception:
...
17:14:28 - [APPLICATION]:
APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs
Exception: System.InvalidOperationException: Operation is not valid due to the current state of the object
at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Peek () [0x00011] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:158
at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue () [0x00000] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:140
at OpenSim.Framework.DoubleQueue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue (TimeSpan wait, OpenSim.Region.ClientStack.Linden.aPollRequest& res) [0x0004e] in /home/avacon/opensim_2013-07-14/OpenSim/Framework/Util.cs:2297
2013-07-15 10:29:42 -07:00
af02231a7b
Added SQLite version of hg travel data store. UNTESTED. Hope it works!
2013-07-14 16:03:46 -07:00
b0140383da
Cleanup old hg sessions (older than 2 days)
2013-07-14 15:47:54 -07:00
e33ac50388
HG UAS: Moved hg-session data from memory to DB storage. This makes it so that traveling info survives Robust resets. It should also eliminate the cause of empty IP addresses in agent circuit data that we saw in CC grid. MySQL only.
2013-07-14 14:31:20 -07:00
5939529036
Minor typo in log message
2013-07-14 14:29:10 -07:00
c8dcb8474d
Let's go easy on authenticating ChildAgentUpdates, otherwise this will be chaotic while ppl are using different versions of opensim. Warning only, but no enforcement.
2013-07-14 10:26:05 -07:00
98f59ffed5
Fix broken tests -- the test setup was wrong... sigh.
2013-07-14 09:22:55 -07:00
c61ff917ef
Authenticate ChildAgentUpdate too.
2013-07-14 09:21:28 -07:00
f3b3e21dea
Change the auth token to be the user's sessionid.
2013-07-14 07:28:40 -07:00
fcb0349d56
And this fixes the other failing tests. Justin, the thread pool is not being initialized in the tests!
2013-07-13 23:01:41 -07:00
e4f741f006
This should fix the failing test.
2013-07-13 22:52:51 -07:00
a2ee887c6d
Deleted a line too many
2013-07-13 22:32:52 -07:00
b4f1b9acf6
Guard against unauthorized agent deletes.
2013-07-13 21:28:46 -07:00
931eb892d9
Deleted GET agent all around. Not used.
2013-07-13 17:56:42 -07:00
4d93870fe5
Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No need to bother the sim.
2013-07-13 17:52:05 -07:00
5a1d6727e1
Some more debug to see how many threads are available.
2013-07-13 11:39:17 -07:00
bc405a6a34
That didn't fix the problem.
...
Revert "Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4."
This reverts commit 6825377380
2013-07-13 11:30:37 -07:00
6825377380
Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4.
2013-07-13 11:11:18 -07:00
3a26e366d2
This commit effectively reverses the previous one, but it's just to log that we found the root of the rez delay: the priority scheme BestAvatarResponsiveness, which is currently the default, was the culprit. Changing it to FrontBack made the region rez be a lot more natural.
...
BestAvatarResponsiveness introduces the region rez delay in cases where the region is full of avatars with lots of attachments, which is the case in CC load tests. In that case, the inworld prims are sent only after all avatar attachments are sent. Not recommended for regions with heavy avatar traffic!
2013-07-13 10:35:41 -07:00
ff4ad60207
Same issue as previous commit.
2013-07-13 10:05:11 -07:00
ccee2959f7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 09:53:05 -07:00
a412b1d682
Moved SendInitialDataToMe to earlier in CompleteMovement. Moved TriggerOnMakeRootAgent to the end of CompleteMovement.
...
Justin, if you read this, there's a long story here. Some time ago you placed SendInitialDataToMe at the very beginning of client creation (in LLUDPServer). That is problematic, as we discovered relatively recently: on TPs, as soon as the client starts getting data from child agents, it starts requesting resources back *from the simulator where its root agent is*. We found this to be the problem behind meshes missing on HG TPs (because the viewer was requesting the meshes of the receiving sim from the departing grid). But this affects much more than meshes and HG TPs. It may also explain cloud avatars after a local TP: baked textures are only stored in the simulator, so if a child agent receives a UUID of a baked texture in the destination sim and requests that texture from the departing sim where the root agent is, it will fail to get that texture.
Bottom line: we need to delay sending the new simulator data to the viewer until we are absolutely sure that the viewer knows that its main agent is in a new sim. Hence, moving it to CompleteMovement.
Now I am trying to tune the initial rez delay that we all experience in the CC. I think that when I fixed the issue described above, I may have moved SendInitialDataToMe to much later than it should be, so now I'm moving to earlier in CompleteMovement.
2013-07-13 09:46:58 -07:00
cd64a70c79
Added UploadBakedTexture/UploadBakedTextureServerConnector, so that this can eventually be served by a robust instance. NOT FINISHED YET.
2013-07-13 08:31:03 -07:00
c6d75cda97
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
2013-07-13 00:57:03 +01:00
a53a10ad27
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-07-13 00:47:58 +01:00
d06c85ea77
Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in order to avoid a race condition.
...
A separate PhysicsActor variable is used in case some other thread removes the PhysicsActor whilst this code is executing.
If this is now impossible please revert - just adding this now whilst I remember.
Also makes method comment into proper method doc.
2013-07-13 00:29:07 +01:00
b4cb644a05
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 00:03:23 +01:00
3d118fb580
In co-op termination, extend EventWaitHandle to give this an indefinite lifetime in order to avoid a later RemotingException if scripts are being loaded into their own domains.
...
This is necessary because XEngineScriptBase now retains a reference to an EventWaitHandle when co-op termination is active.
Aims to address http://opensimulator.org/mantis/view.php?id=6634
2013-07-13 00:02:54 +01:00
fa02f28dbf
Add ToOSDMap() overrides to the Stat subclass CounterStat.
...
Add a GetStatsAsOSDMap method to StatsManager which allows the filtered
fetching of stats for eventual returning over the internets.
2013-07-12 14:04:14 -07:00
3d700bb42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-12 12:54:29 -07:00
29f6ae199e
Changed UploadBakedTextureModule so that it uses the same pattern as the others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
2013-07-12 12:53:58 -07:00
65239b059f
Enhance NullEstateData to remember stored estate values and return
...
them next time asked. This keeps any estate settings from being reset
when the estate dialog is opened in a region with null estate storage.
2013-07-11 20:55:32 -07:00
1909ee70f8
Centralize duplicated code in SceneObjectPart for subscribing to
...
collision events. Improve logic for knowing when to add processing
routine to physics actor.
2013-07-11 16:57:07 -07:00
83d1680057
Added a few more thingies to the asset client test to poke the threadpool.
2013-07-11 16:43:43 -07:00
ba8f9c9d0a
Try naming the materials handlers again, this time registering the POST as RenderMaterials
...
This was probably the mistake.
The other handlers are named RenderMaterials as well but this actully has no affect apart from on stats, due to a (counterintuitive) disconnect between the registration name and the name of the request handler.
Will be tested very soon and reverted if this still does not work.
2013-07-11 23:51:10 +01:00
7c2e4786ce
minor: remove some regression test logging switches accidentally left uncommented.
2013-07-11 23:19:55 +01:00
e15a15688b
minor: Take out unnecessary clumsy sleep at the end of regression Test404Response().
...
This wasn't actually necessary in the end but was accidentally left in.
2013-07-11 23:11:35 +01:00
f57f49eede
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 23:05:10 +01:00
44e9849ed1
Fix regression where llHTTPRequests which did not get an OK response returned 499 and the exception message in the http_response event rather than the actual response code and body.
...
This was a regression since commit 831e4c3http://opensimulator.org/mantis/view.php?id=6704
2013-07-11 23:02:30 +01:00
ee51a9f9c9
Added property to make for more flexible testing.
2013-07-11 14:23:37 -07:00
51d106cff8
Added a test for the asset service
2013-07-11 14:21:57 -07:00
c4f1ec1fd6
Changed the UserProfileModule so that it's less greedy in terms of thread usage.
2013-07-11 10:21:20 -07:00
ea371a6f54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 09:48:15 -07:00
604967b31e
Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they are also non-blocking handlers.
2013-07-11 09:47:46 -07:00
3b48b6a792
Switched TransferRequest (UDP packet handler) to sync. The permissions checks may block, so they get a FireAndForget. Everything else is non-blocking.
2013-07-11 09:44:48 -07:00
0120e858b7
remove names from Capability handlers (added by justincc in commit 013710168b) as they seem to disable the use of multiple access methods for a single Capability in MaterialsDemoModule
2013-07-10 22:30:41 -07:00
9173130fde
Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.
2013-07-10 20:48:13 -07:00
fe5da43d15
EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. This _shouldn't_ screw things up, given that all this does is to dump the request in a queue.
2013-07-10 19:29:14 -07:00
bdaeb02863
show client stats: Fixed the requests/min. Also changed the spelling of the command, not without the dash.
2013-07-10 17:14:20 -07:00
864a86983e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-10 16:10:04 -07:00
1b265b213b
Added show client-stats [first last] command to expose what viewers are requesting.
2013-07-10 16:09:45 -07:00
59d19f038a
Remove a null reference exception in SimianPresenceServiceConnector that
...
occurs when GetGridUserInfo cannot find the requested user info.
2013-07-10 08:55:54 -07:00
38e6da5522
Comment out old inbound UDP throttling hack. This would cause the UDP
...
reception thread to sleep for 30ms if the number of available user worker
threads got low. It doesn't look like any of the UDP packet types are
marked async so this check is 1) unnecessary and 2) really crazy since
it stops up the reception thread under heavy load without any indication.
2013-07-09 18:34:24 -07:00
bb6fb65392
Revert "minor: remove some mono compiler warnings in UserProfileModule"
...
Revert until we understand why all the calls to GetUserProfileServerURI were also
commented out.
This reverts commit 5f58b9b552
2013-07-09 18:24:39 -07:00
cec8e6d0f7
If a sensor is in an attachment, avoid throwing an exception if the attachee is removed from the scene before we try to retrieve them.
2013-07-09 23:52:47 +01:00
095066b1ce
Handle UUIDNameRequest UDP packet processing async instead of within the main inbound UDP processing loop, to avoid any chance that this is delaying the main udp in loop.
...
The potential impact of this should be lower now that these requests are being placed on a queue.
2013-07-09 23:39:29 +01:00
d0dfb744b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-09 14:13:51 -07:00
67e500383e
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
2013-07-09 14:12:52 -07:00
2c761cef19
BulletSim: add parameter to optionally disable vehicle linear deflection.
...
Add parameter to not apply vehicle linear deflection Z forces if
vehicle is not colliding. This defaults to 'true' so vehicles will fall
even if there is some linear deflection to apply.
2013-07-09 09:37:42 -07:00
065f8f56a2
remove some cruft and trigger a rebuild
2013-07-08 19:18:01 -07:00
33eea62606
remove an invalid null UUID check which caused a warning
2013-07-08 17:12:39 -07:00
fad4241e4e
BulletSim: make all the different angularVerticalAttraction algorithms
...
selectable from configuration paramters.
Changed default algorithm to "1" from previous default as it seems to
handle Y axis correction a little better.
Add config file independent enablement of vehicle angular forces to
make debugging easier (independent testing of forces).
2013-07-08 16:24:31 -07:00
76b2b20f7e
minor: remove mono compiler warnings from HGSuitcaseInventoryService
2013-07-09 00:06:22 +01:00
5f58b9b552
minor: remove some mono compiler warnings in UserProfileModule
2013-07-09 00:04:46 +01:00
83da14008f
minor: remove some mono compiler warnings in new groups code
2013-07-08 23:57:05 +01:00
af9b17c545
minor: remove mono compiler warnings related to keyframe code
2013-07-08 23:52:40 +01:00
2025dd25f6
Add missing file BaseOutputStreamHandler.cs from recent commit e19defd
2013-07-08 23:50:40 +01:00
047ef9c2a5
minor: remove some mono compiler warnings in OdePlugin
2013-07-08 23:36:57 +01:00
eccec4f8f6
minor: remove now unused migration-hack bool from DAMap
2013-07-08 23:32:19 +01:00
8be59829d1
minor: Add back commented out logging message in Caps.RegisterHandler() that I accidentally removed.
2013-07-08 22:41:24 +01:00
013710168b
For stat purposes, add names to capability request handlers where these were not set
2013-07-08 22:39:07 +01:00
dc54581700
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:19:37 +01:00
b2d4b8b1da
BaseHttpServer: if the handler sets the content length, don't override it. This happens in HEAD handlers.
2013-07-08 14:12:11 -07:00
c3db595944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:07:27 +01:00
e19defde36
Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap
...
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
2013-07-08 22:03:07 +01:00
a38c2abae4
Make dictionary read/write locking consistent in CapabilitiesModule, rename two dictionary fields to standard m_ format
2013-07-08 18:07:04 +01:00
c66a9a08e4
Placed a throttle on UserManagementModule for name lookups. Singularity apparently is flooding the sims with name requests.
2013-07-08 08:41:18 -07:00
1e72e1b258
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-07 20:44:23 -07:00
bbb9af363d
Print out caller IP when unusual requests are received.
2013-07-07 20:43:42 -07:00
bbc40fab62
BulletSim: Different Implementation of Angular Deflection for vehicles, Activates it again and fixes problem with fighting with vertical attractor removing wobble of forward axis. Comments on testing welcome, May require adjustments of this force or other forces after this commit, exact tweaking to come after testing on other hardware.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-07-07 06:18:50 -07:00
6026759406
BulletSim: fix jumping up and down of linksets when center-of-mass
...
was enabled. Didn't effect the physical position but the viewer saw
the linkset jumping between its simulator center and its physical
center.
2013-07-07 05:47:41 -07:00
70d24a654b
BulletSim: rename position and orientation variables to remove the
...
inconsistant use of Raw* and _* conventions.
2013-07-07 05:46:24 -07:00
1286677352
Try to normalize the creatorData of scene object parts with the trailing '/'. What a nightmare this '/' is!
2013-07-06 18:37:54 -07:00
803e5498b0
A little more debug
2013-07-06 18:27:03 -07:00
71e26555bd
Revert "WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT"
...
This reverts commit 9b75d75724
2013-07-06 18:16:27 -07:00
391633c072
Some more fixes on strange behaviors of Unknown User, esp. related to large messy inventories and esp. related to kokua
2013-07-06 18:02:17 -07:00
1dd3a0bc57
MORE DEBUG. DON"T USE THIS.
2013-07-06 17:29:19 -07:00
9b75d75724
WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT
2013-07-06 16:51:14 -07:00
93fd5e4036
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-06 15:18:29 -07:00
b29a09ab8e
Simina activity detector was too eager. Disabled it in case simian is not being used.
2013-07-06 15:17:55 -07:00
d838f15d97
Add implementations for llSetVelocity and llSetAngularVelocity.
2013-07-06 09:53:30 -07:00
a65cec3986
BulletSim: implementation of linkset center-of-mass.
...
Default off, for the moment, until more testing.
Add separate thread and center-of-mass flags to OpenSimDefaults.ini.
Clean up comments in OpenSimDefaults.ini.
2013-07-06 08:25:15 -07:00
97698ae311
BulletSim: More tweaking on center-of-mass. Almost there. Changes have no effect if LinksetOffsetCenterOfMass=false (the default).
2013-07-06 08:25:15 -07:00
03268d85c4
BulletSim: comments and non-functional changes working toward the center-of-gravity implementation.
2013-07-06 08:25:14 -07:00
5f97c6f8f0
BulletSim: non-functional updates. Comments and formatting.
...
Update TODO list.
2013-07-06 08:25:13 -07:00
c358d5d168
Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to be less dependent on a Scene.
2013-07-05 20:17:10 -07:00
98de67d573
Fix mono warning in LLImageManagerTests
2013-07-06 00:55:14 +01:00
55ac8c83c7
Get InventoryWorkerThreads to update watchdog on processing requests
2013-07-06 00:34:22 +01:00
67407024a2
Update thread watchdog on GridServiceRequestThread periodically and turn off alarming
...
Unfortunately, alarm can spuriously go off if the thread blocks for a long time on an empty queue.
2013-07-06 00:29:19 +01:00
5dbdd5f8b4
refactor: Make stats and sim status simpler by extending BaseStreamHandler like other handlers instead of implementing the IStreamedRequestHandler interface directly
2013-07-06 00:12:48 +01:00
dd15f95499
Add very basic regression test TestChildAgentSingleRegionCapabilities() which checks for addition and removal of capabilities on add/remove of child agent
2013-07-05 20:06:27 +01:00
ca26583e6b
Delete some verbose debug messages
2013-07-04 15:17:06 -07:00
8265a88c4a
Throttle the viewer's requests for region handles. Apparently Kokua is requesting this for all landmarks in inventory. Not sure why. But this seems to be the root cause of the login freeze mentioned before. This commit adds a blocking queue / process thread pattern.
2013-07-04 14:51:18 -07:00
5ddcc25ee9
Merge branch 'master' into careminster
2013-07-04 22:32:58 +01:00
d80936bbbb
Guard against completely unknown user UUIDs.
2013-07-04 14:07:25 -07:00
da3aa44138
Debug the RegionHandle handler (same issue)
2013-07-04 13:27:53 -07:00
33ddb6c246
Revert "WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT."
...
This reverts commit c95a23863a
2013-07-04 13:25:58 -07:00
c95a23863a
WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT.
2013-07-04 13:13:52 -07:00
38a04ff993
Revert "Same freeze issue, now checking if it's in estate"
...
This reverts commit ca380ec039
2013-07-04 13:00:06 -07:00
d997c49e47
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 12:45:34 -07:00
ca380ec039
Same freeze issue, now checking if it's in estate
2013-07-04 12:41:45 -07:00
93ee515d9d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 20:41:02 +01:00
fdafc2a16c
With diva's permission, temporarily reinsert Unknown UserUMMAU3 to make sure that GUN7 failure has largely disappeared.
...
Unknown UserUMMAU3 insertion should definitely be removed down the line.
However, I would like a little more time to check the GUN* reduction first, since removing UMMAU3 will make these failures appear as GUN7 instead.
Also bumps GUN6 -> GUN7 and UMMAU2 -> UMMAU3
2013-07-04 20:39:16 +01:00
bf214122cd
More debug, same issue
2013-07-04 11:53:22 -07:00
15d0bc0900
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 11:37:00 -07:00
ec9ffbb89a
More debug, same issue
2013-07-04 11:36:10 -07:00
c61becc62b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 19:33:12 +01:00
0cc0a2485c
More debug related to the previous commit
2013-07-04 11:18:05 -07:00
ae42c93f9a
Now trying to find a cause of freeze at login related to friends status notifications.
2013-07-04 10:59:21 -07:00
98a2fa8e35
HG Friends: this was commented some commits ago, but it shouldn't have been.
2013-07-04 10:23:20 -07:00
068a3afad9
HG Friends: migration #3 is failing on some installations of MySql. Setting the table to InnoDB seems to fix the problem.
2013-07-04 09:51:31 -07:00
16f40c1a15
Add --default option to "debug lludp packet" command to allow packet logging to be performed immediately from client start
2013-07-04 17:29:53 +01:00
5eb78aad96
Revert "HG Friends: debug an issue where the friends data stored in the DB is incomplete."
...
This reverts commit 27cdfb7b84
2013-07-04 09:17:01 -07:00
80f4a008eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 08:48:19 -07:00
27cdfb7b84
HG Friends: debug an issue where the friends data stored in the DB is incomplete.
2013-07-04 08:47:45 -07:00
25889b2d7e
change "debug packet" command to "debug lludp packet" to conform with other "debug lludp" options
...
also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs
gets all debug lludp commands to only activate for the set scene if not root
2013-07-04 00:02:53 +01:00
119f84fe11
Squoosh one last opportunity for Unknown Users to creep in.
2013-07-02 17:03:04 -07:00
06dba1fa62
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-02 16:47:17 -07:00
4d24bf75fd
Deleted debug messages. Fixed a null ref exception on the POST handler of GridUserServerPostHandler.cs
2013-07-02 16:46:35 -07:00
d01b8e163d
minor: Correct typo of "Descrition" to "Description" in "show object *" console commands
...
Thanks to Ai Austin for pointing this out.
2013-07-03 00:27:22 +01:00
316e8f9239
Fix SQL statement
2013-07-02 16:10:09 -07:00
9725b829d5
Do the same for SQLite and MSSQL
2013-07-02 15:48:30 -07:00
2c05caec7f
Really make it call the method with the query interface
2013-07-02 15:47:02 -07:00
626940ceb8
More debug messages
2013-07-02 15:39:10 -07:00
e984bfb4c6
This should have a strong effect on the Unknown User issue mantis #6625
2013-07-02 14:31:39 -07:00
ccca005969
HG: close a loophole by which if something was wrong with the ServiceURLs it resulted in never ending asset requests
2013-07-02 13:29:44 -07:00
635704b7ef
Update debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and UserUMMAU -> UserUMMAU2 to track any new occurences.
...
This is to see the impact that Diva's fixes related to this issue (last one is currently commit c7383688http://opensimulator.org/mantis/view.php?id=6625
2013-07-01 23:54:04 +01:00
8eb86c9ec9
BulletSim: add the reset of the last commit for flush log file problems.
...
Fix small typo in one log message.
2013-06-30 19:22:43 -07:00
c24c99f4ba
BulletSim: fix an occasional crash with flushing log files.
2013-06-30 19:08:15 -07:00
9d5ae75950
BulletSim: remove the handle to the vehicle actor and cause routines
...
that need it to look it up.
2013-06-30 17:07:51 -07:00
425d2a2a97
BulletSim: set linkset type to be prim specific rather than a simulator
...
wide default. This allows individual prims to differ in the
underlying linkset implementation.
2013-06-30 17:07:50 -07:00
23516717e4
BulletSim: a better version of llMoveToTarget that doesn't go crazy.
...
There is still some overshoot but mostly fixes Mantis 6693.
Fix bug where moveToTarget was active for non-physical objects
and while selected.
Fix bug where move target was not getting changed if the script
changed the target during a move.
2013-06-30 17:07:49 -07:00
2f4a729d40
BulletSim: add inTaintTime parameter to collision cache clear function.
2013-06-30 17:07:48 -07:00
ffcee82b1d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2013-06-30 18:27:30 +01:00
e377abcc35
Groups V2: charge for group creation only after the group has been successfully created
2013-06-30 08:39:35 -07:00
c738368846
Revert "More debug mantis #6625"
...
This reverts commit 20f2cf8769
2013-06-30 07:25:46 -07:00
1e97972f78
Revert "One more debug mantis #6625"
...
This reverts commit 8fa5d12fcb
2013-06-30 07:25:13 -07:00
d7775d1e11
Revert "A little more debug for the Unknown User problem mantis #6625"
...
This reverts commit ff47cf77ab
2013-06-30 07:22:27 -07:00
1fc873d09f
Same fix to LocalInventoryServiceConnector.cs
2013-06-30 07:21:22 -07:00
74e7fac13f
More on mantis #6625
2013-06-29 22:32:26 -07:00
20f2cf8769
More debug mantis #6625
2013-06-29 21:54:10 -07:00
c462e0a51c
Fixed previous debug message
2013-06-29 21:30:07 -07:00
8fa5d12fcb
One more debug mantis #6625
2013-06-29 21:26:58 -07:00
0c97021565
More debug for mantis #6625 . It looks like the home friends list is being fetched on HG TPs.
2013-06-29 21:05:45 -07:00
ff47cf77ab
A little more debug for the Unknown User problem mantis #6625
2013-06-29 19:15:25 -07:00
00093a305d
Changed HG status notifications timeout down to 15secs from the default 100.
2013-06-29 18:35:23 -07:00
3a634c56e3
Remove hack to migrate previous experimental-level os materials data.
...
This didn't seem to be working anyway and it's better not to have such hacks in the code for experimental stuff.
2013-06-29 00:23:41 +01:00
371085546d
Add materials store null check into UuidGatherer code.
2013-06-28 23:57:41 +01:00
4cb4c9fb25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-28 14:03:46 -07:00
cbb5122729
add some locking to materials storage dictionary
2013-06-28 14:00:28 -07:00
e26e8b8829
Remove "Asset deletion not supported by database" message from "delete asset" robust/standalone console command since it actually was implemented and performed.
...
Improve other associated messages.
2013-06-28 19:19:38 +01:00
dc0455e217
In XAssetService, on a delete asset request also delete the asset in any chained service.
...
This eliminates the async migration since it causes a race condition with the "delete asset" console command
2013-06-28 19:11:44 +01:00
f6ce87c96d
Reinsert code for gathering uuids reference by materials back directly into UuidGatherer for now.
...
This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes.
There needs to be some way for modules to register for events which are not connected with a particular scene.
2013-06-28 18:50:33 +01:00
529633d970
add method docs for DAMap.GetStore() and DAMap.SetStore()
2013-06-27 18:44:27 -07:00
d47fc48b32
and yet another check for null returned from DynAttrs.GetStore()
2013-06-27 18:01:17 -07:00
c1b8f83dd4
test for null return from DynAttrs.GetStore()
2013-06-27 17:53:15 -07:00
149487ea0f
refactor: Move code for gathering textures referenced by materials into MaterialsDemoModule from UuidGatherer
...
This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
2013-06-27 23:42:35 +01:00
f7d09b898a
Make the concept of namespaces explicit in dynamic attributes
...
This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc.
All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace.
This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors.
This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release.
However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
2013-06-27 23:14:28 +01:00
f78d2ef166
Update temporary "Unknown UserUMMTGUN2" name to "Unknown UserUMMTGUN3" to see if Diva's recent HG updates (post 6c7e33f) fix this issue.
...
This string is returned if a UserManagementModule.TryGetUserNames() cannot find a server-side name binding or a user account for a given UUID.
This is only called when the viewer requests a binding via the UDP UUIDNameRequest message
2013-06-25 00:46:15 +01:00
ce9b1320d2
Improve situation where editing just the root prim of an attachment causes other prims to be set to very far off positions on reattach.
...
Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334
However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
2013-06-25 00:41:46 +01:00
4b00203fa5
Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 structs
2013-06-25 00:15:55 +01:00
f70357eaa3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-06-23 01:59:57 +01:00
936700bda3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-23 01:49:45 +01:00
24a4367fc2
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2013-06-23 01:48:57 +01:00
25ed1658ca
Merge branch 'master' into careminster
2013-06-23 01:35:09 +01:00
4bf1afe300
Fix prim locking to behave like SL
2013-06-23 01:34:35 +01:00
8e9d6c6c56
Fix prim locking to behave like SL
2013-06-23 01:14:07 +02:00
edb11a7eca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-22 08:29:54 -07:00
6c7e33fe47
Change IsLocalRegion from using region handle to using regionID. This was affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
2013-06-22 08:29:06 -07:00
ca3ce6da73
HG: avoid call on localhost between sim and UAS for standalone.
2013-06-22 08:26:59 -07:00
4778d67005
Finally moved HG agent transfers to use agent fatpacks.
2013-06-21 20:52:46 -07:00
74539659f6
BulletSim: move new linear deflection code to own routine.
...
Remove VehicleForwardVelocity changed storage since the value
will be modified as movement is processed.
2013-06-21 10:46:21 -07:00
a5de4f692b
BulletSim: Implementation of Linear Deflection, it is a partial help for the vehicle tuning diffrence between Opensim and Second life.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-06-20 19:02:15 -07:00
bbeff4b8ca
BulletSim: rework velocity updating when not colliding and not flying
...
to prevent infinite jumps. Now jumps last only AvatarJumpFrames long
(default 4) which is about as high as in SL.
TODO: jumping should only depend on standing (collision with feet)
rather than collision anywhere on the avatar.
2013-06-20 09:55:40 -07:00
a33b6eed6d
minor: remove mono compiler warnings in WebsocketServerHandler.cs
2013-06-20 00:54:19 +01:00
085a87060a
Change "ObjectMemory" stat to "HeapMemory" to align with other stat names. Also round this and ProcessMemory to three decimal places in common with other memory stats.
...
I believe leaving out such minor info makes stats easier to read
2013-06-20 00:52:39 +01:00
05790ba1cf
Allow more than one stat category to be specified in "show stats"
...
e.g. "show stats httpserver.9000 server.network"
2013-06-20 00:45:56 +01:00
5b1a9f84fd
minor: Change "memory churn" terminology in statistics to "heap allocation rate" since this is more generally meaningful
2013-06-20 00:32:12 +01:00
d97333255d
Fix minor bug where the check whether to display SmartThreadPool stats was accidentally != null rather than == FireAndForgetMethod.SmartThreadPool
...
Due to another check this had no practical effect
2013-06-20 00:22:44 +01:00
3370e19205
minor: fix mono compiler warning in FetchInventory2Handler
2013-06-20 00:17:20 +01:00
086fd70a5f
Make it possible to specify display of stats in a particular 'container' by separating category and container with a period.
...
e.g. "show stats server.network"
I failed to realize this had already been implemented without the period in the show stats command (as the command help had not been updated).
However, I would prefer the . approach as it will allow specifying multiple stats, easier wildcarding, etc.
This commit also prevents any stat from having a period in its short name.
2013-06-20 00:00:39 +01:00
84af1cab9b
Display existing statistic of how many http requests a server is making as server.network.HTTPRequestsMade in "show stats all"
2013-06-19 20:48:12 +01:00
8a86e29579
Mantis 6608: Math error in parcel dimensions/borders seen with land show command
...
This patch changes the land show console command to return numbers in the
range 4 to 256 for the "to" coordinates instead of 0 to 252
Also trailing spaces removed from some lines.
2013-06-19 00:26:23 +01:00
1a72f62d7b
minor: remove mono compiler warning in OfflineIMService
2013-06-18 23:52:15 +01:00
3fe5e9057f
Prevent an exception if no offline messages were retrieved.
2013-06-18 23:15:38 +01:00
dda44e31e3
minor: tidy up spacing if display a unit for additional stat information
2013-06-18 23:10:50 +01:00
9501a583cb
Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat
2013-06-18 23:07:18 +01:00
768e8e363b
Fix issue where stat samples were accidentally static, so that any additional stat with sampling would produce wrong results
2013-06-18 22:49:49 +01:00
0767523834
Fix other places when saving scripts or notecards in prim inventories where messages should be transient without an OK button
2013-06-18 21:21:59 +01:00
c78cb96c62
Allow coalesced objects to be rezzed even if they extend past the sim bounds
2013-06-18 04:42:20 +02:00
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
a1e32b8437
If SmartThreadPool is active, display statistical information about it in "show stats server"
...
Also puts these and previous builtin threadpool stats in the "threadpool" stat container rather than "processor"
2013-06-18 00:10:21 +01:00
b7c9dee033
refactor: Move existing code to generate report information on the threadpool to the ServerBase rather than being in Util
2013-06-17 23:57:10 +01:00
c0a00cd7fd
Fix bug where no threadpool data would be displayed in the "show threads" command if threadpool type was QueueUserWorkItem (Unsafe worked as expected)
2013-06-17 23:34:09 +01:00
713a14a6b5
minor: remove mono compiler warnings in WebFetchInvDescModule
2013-06-17 23:23:56 +01:00
b9dac1f8df
Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9
2013-06-17 23:17:55 +01:00
865d46ae1e
Drop server level stats to debug instead of info.
...
This was the original intention with these stats, as I didn't believe they would be useful to ordinary users if everything is working as it should.
Please amend if this is an issue.
Just for now, levels actually have no impact on what is displayed via the "show stats" command.
2013-06-17 22:57:47 +01:00
2c9bb0f973
Add server stats for available builtin threadpool and iocp workers
2013-06-17 22:55:25 +01:00
0d2fd0d914
Make general server stats available on the robust console as well as the simulator console
...
This means the "show stats" command is now active on the robust console.
2013-06-17 22:39:00 +01:00
694c4bcbb6
correct method doc for llRot2Axis()
2013-06-14 20:00:20 -07:00
e6cb7b4764
Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfileModule since in the presence of writes these are not thread-safe operations.
...
Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together
2013-06-15 00:52:57 +01:00
42b0c68eab
Correct build break in previous commit 9c530d7
2013-06-15 00:46:55 +01:00
9c530d725f
refactor: In UserProfileModule, change classifiedCache and classifiedInterest to m_classifiedCache and m_classifiedInterest
...
This is the coding standard name style for private fields.
2013-06-15 00:41:02 +01:00
ecfc6a3f4a
Add the standard OpenSimulator copyright notice to the top of InventoryCache.cs
2013-06-15 00:36:16 +01:00
720806b661
Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache isn't needed since it's thread safe but r/w of contained dictionaries isn't thread-safe
2013-06-15 00:34:45 +01:00
da3724a904
minor: remove mono compiler warnings from LSL_Api, properly format method doc for llRot2Axis()
2013-06-15 00:11:36 +01:00
f074739e33
Mantis 6280: llSetContentType(). An implementation.
...
An implimentation of llSetContentType including all of the new
constants added since the mantis was raised.
2013-06-15 00:06:03 +01:00
fc89bde044
Mantis 6108: ossetprimitiveparams temporary/phantom problem
...
Corrected to ensure that the target prim is updated by
osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM
instead of the prim that the script is in.
2013-06-15 00:00:00 +01:00
db9d9d83eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-14 23:58:16 +01:00
d412c1b0eb
Don't try to abort worker threads in WebFetchInvDescModule if module was not enabled.
...
This also moves the abort to RemoveRegion() rather than a destructor.
2013-06-14 23:53:20 +01:00
d7f3d7efd2
Merge branch 'master' of /home/opensim/src/opensim
2013-06-13 09:27:13 -04:00
b2c8d5eec7
Add Option: ClassifiedFee
...
Add option to set minimum fee for publishing classifieds. Many viewers have a
hard coded minimum of 50, which makes publishing classifieds fail where grids
have no economy. This allows the grid to set the minimum fee to a suitable
value for their operation.
The option is located in the [LoginService] section and defaults to 0. The
value is sent as "classified_fee" in the login response.
2013-06-13 09:18:27 -04:00
9975c5674c
Merge branch 'master' into careminster
2013-06-13 02:49:43 +01:00
0be80e5813
Forward the reason to the script
2013-06-13 02:52:51 +02:00
62c277ff9f
Add a result param to te money module interface
2013-06-13 02:52:11 +02:00
689969e143
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
...
Conflicts:
OpenSim/Data/SQLite/SQLiteSimulationData.cs
2013-06-13 02:50:39 +01:00
b271217084
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 17:48:48 -07:00
7c00ccb548
DataSnapshot: changed those annoying messages to Debug instead of Info.
2013-06-12 17:48:20 -07:00
6b8e94864a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-13 00:33:53 +01:00
7759b05dcb
Make XInventoryServicesConnector properly handle a RESULT = false return for methods where this contains failure rather than throwing an exception.
...
Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
2013-06-13 00:31:32 +01:00
3357300362
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
2013-06-12 18:13:00 -05:00
824a4b4808
After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistently check for null return and log warning rather than throw exception.
...
This was being done already in some places.
If an exception is thrown it is now an error rather than debug
2013-06-12 23:47:47 +01:00
ef5be42c86
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 23:32:51 +01:00
47b6e78790
Implement logging of first 80 characters (debug level 5) or full body data (debug level 6) on outgoing requests, depending on debug level
...
This is set via "debug http out <level>"
This matches the existing debug level behaviours for logging incoming http data
2013-06-12 21:34:20 +01:00
3cb65f0d31
BulletSim: when meshing or asset fetching fails, include position
...
and region with the offending object's name in the error message.
2013-06-11 17:58:08 -07:00
7556a0f699
Add TriggerScenePresenceUpdated events when an animation is added
...
or removed. Shouldn't impact anyone as only DSG seems to use
OnScenePresenceUpdated event.
Some minor format changes to AnimationSet's ToString().
2013-06-11 17:18:12 -07:00
135e10ba09
Uncomment Mic's code and split to create new regression TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()
2013-06-11 23:55:45 +01:00
d8da83b4ff
Removed the lock entirely
2013-06-11 15:50:12 -07:00
a0fed03e10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-11 15:36:52 -07:00
b33db917f5
Really bad idea to lock m_UserCache for so long in UserManagementModule. Added a special lock object instead, if we really want to avoid concurrent executions of that code.
2013-06-11 15:36:27 -07:00
26b66c730e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 21:03:16 +01:00
162dfd8a38
Merge branch 'avination-current' into careminster
2013-06-11 21:03:02 +01:00
400f876d98
Merge branch 'master' into careminster
2013-06-11 21:01:58 +01:00
a4a4898a0e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 20:39:09 +02:00
d47a18fd09
* Adds KeyFrameMotion storage support to SQLite, just a note, seems that there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this.
...
* Has a prim table migration.. that might take a while, hold on to your hats.
* Fixes a null-ref when shutting down while keyframed motion is active.
2013-06-11 08:56:20 -05:00
ed950e6c74
Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Addresses Mantis #0006671
2013-06-11 00:29:40 -07:00
ba84074468
LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization fails
2013-06-10 17:54:14 -07:00
9d9b9d4938
llRot2Angle now checks absolute value of s rotation component before normalizing
2013-06-10 17:11:49 -07:00
b242ead6df
llRot2Axis now checks absolute value of s rotation component before normalizing. Also removed some excessive division and cleaned up a bit
2013-06-10 17:10:04 -07:00
6b55be6e2f
Merge branch 'master' into careminster
2013-06-11 01:04:50 +01:00
a022ee5766
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-06-11 01:03:15 +01:00
1c7fbb86c2
Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669
2013-06-10 18:47:08 -05:00
a949556c4e
add a Normalize() method for LSL_Rotation
2013-06-10 16:42:49 -07:00
7af97f88b7
Add port numbers to poll service thread names so that we can tell which belong to which HttpServer
2013-06-10 23:39:17 +01:00
32d1e50565
Reinstate explicit starting and stopping of PollServiceRequestManager added in 3eee991 but removed in 7c0bfca
...
Do not rely on destructors to stop things.
These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503
and most probably http://opensimulator.org/mantis/view.php?id=6668
2013-06-10 23:30:35 +01:00
a2f1cd87f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-10 15:15:38 -07:00
82e3b9a6e0
Fix test for adding temporary assets. Code for non-local temporary assets
...
is there but commented out.
2013-06-10 15:14:55 -07:00
795acaa6aa
BulletSim: add failure flag for meshing failure vs asset fetch failure
...
so error messages make more sense.
Change some BulletSim status log messages from WARN to INFO.
Update TODO list.
2013-06-10 14:12:45 -07:00
57141e34bf
Remove Temporary from use to shortcut asset stores. The Local property
...
differentiates between local & grid storage. The Temporary property just
says that which service handles the it, the asset can be safely removed
in the future.
2013-06-10 13:26:19 -07:00
7de0912a97
Mantis 5346: llAxisAngle2Rot() should normalize before computing
...
Corrected to agree with
http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes
to normalise the vector before computing the quaternion
Signed-off-by: dahlia <dahlia@nomail>
2013-06-10 04:13:34 -07:00
e741e5ebce
More on mantis #6666 -- Groups V2 remote connector.
2013-06-09 20:20:37 -07:00
745a209bf2
Explicitly set uploaded mesh object perms
2013-06-10 01:16:22 +02:00
925a8d47eb
Merge branch 'avination-current' into ubitwork
2013-06-08 19:19:51 +01:00
244f6fa5cd
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2013-06-08 19:18:47 +01:00
4e2e69bd25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-08 11:01:20 -07:00
d00770d56b
Groups V2 -- fix mantis #6666
2013-06-08 11:00:22 -07:00
75e4af9d39
Catch exception triggered by incoming avatars using legacy profiles
2013-06-08 11:00:05 -04:00
8582b2b992
Make objects attached from the ground appear in inventory again. Fixes a number
...
of interaction issues causing client crashes.
2013-06-08 02:32:05 +02:00
34d40e46a5
Merge branch 'profiles'
...
message to explain why this merge is necessary,
2013-06-07 20:17:45 -04:00
1cb1245d84
SQLite support for UserProfiles
2013-06-07 20:14:39 -04:00
1387224821
Ensure selected module is the only active one
2013-06-07 20:09:10 -04:00
6aa54a8e16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 16:01:07 -07:00
cf4d291443
Merge branch 'master' into careminster
2013-06-08 00:00:39 +01:00
07cc16ff9c
Put the configuration back in FetchInventoryDesc2 cap.
2013-06-07 16:00:32 -07:00
3a722ef81b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-07 23:59:02 +01:00
75631e0267
Supply proper type information for the various types of requests
2013-06-07 23:55:03 +01:00
7c0bfca7a0
Adding Avination's PollService to round out the HTTP inventory changes
2013-06-07 23:43:45 +01:00
454499ff60
minor: Comment out debug logging (at warn level) about number of objects force selected and turn down to debug level
2013-06-07 23:38:23 +01:00
ed7fe6239c
add indexes for new visual parameters shape_hover and
...
APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for
now
2013-06-07 23:18:48 +01:00
45e333652c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2013-06-07 23:09:53 +01:00
17a902fed4
Clean up poll service
2013-06-07 22:39:27 +02:00
f2a4d9b99c
Fix regression where multiple close agents could be sent to the wrong neighbour region on root agent close.
...
This was introduced in git master d214e2d0http://opensimulator.org/mantis/view.php?id=6658
2013-06-07 19:13:24 +01:00
a74e65200c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 19:12:55 +01:00
045c26f626
In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.
2013-06-07 18:43:00 +01:00
664c6191ed
Mantis #6620 (removed debug message)
2013-06-07 08:37:18 -07:00
dd7404d850
Merge branch 'master' into careminster
2013-06-06 23:50:03 +01:00
ac9c37f31b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-06 23:49:34 +01:00
06012f8675
Fix keyframe motion copyright
2013-06-06 23:49:02 +01:00
c173c2eed5
try to suspend and resume keyframes on copy to inventory to take copy
...
doesn't destroy state
2013-06-06 19:21:21 +01:00
8bfd5c8927
Merge branch 'avination-current' into ubitwork
2013-06-06 19:03:32 +01:00
18e4496d2d
keyframe: add more locks, change timming stop, added Suspend and resume
2013-06-06 18:57:32 +01:00
25fa647a74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 20:20:22 -07:00
2ebf70d719
Strengthen some assumptions.
2013-06-05 20:19:59 -07:00
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
a3210d1cf8
Database persistence for keyframes. Contains a Migration.
2013-06-06 03:17:38 +01:00
ea9e1d1a1e
Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster
2013-06-06 03:04:47 +01:00
81ad9255b5
Hook up Keyframe motion to almost everything. Failing to cross a sim border
...
may yield unexpected results in some cases. No database persistence yet,
2013-06-06 03:03:05 +01:00
e1d98c9e4c
Committing Avination's Keyframe module. This is not hooked up yet and will do nothing. More commits to follow.
2013-06-06 02:25:19 +01:00
c5d967b946
Merge branch 'avination-current' into ubitwork
2013-06-06 00:37:06 +01:00
26cd59cd6f
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-06-05 18:55:42 -04:00
e53b62304f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-05 23:44:26 +01:00
a7dbafb0e3
Port Avination's inventory send throttling
2013-06-05 23:42:50 +01:00
e449950030
Prevent processing for Npc
2013-06-05 18:42:15 -04:00
cd64da8746
Cleanup
2013-06-05 18:41:55 -04:00
47ffa12078
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 22:26:42 +01:00
f41fc4eb25
Avoid a deadlock where a script can attempt to take a ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order.
...
This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless).
The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region.
This looks to address http://opensimulator.org/mantis/view.php?id=6557
2013-06-05 22:20:48 +01:00
10572b78f8
Remove a couple of orphaned lines
2013-06-05 15:10:53 -04:00
b4f472c4fa
Make locking more uniform
2013-06-05 15:08:25 -04:00
b5d0ac4c42
BulletSim: default PhysicsTimeStep to same as the simulator's
...
heartbeat timestep when running the physics engine on a separate
thread. This reduces the occurance of heartbeats that happen when
there is no physics step which is seen as vehicle jerkyness.
2013-06-05 07:12:14 -07:00
0c971d148c
BulletSim: fix corner case when rebuilding a compound linkset while
...
a mesh/hull while a mesh or hull is being rebuilt when its asset
is fetched. This fixes a 'pure virtual function' crash when changing
physical state of complex linksets that include many meshes.
2013-06-05 07:09:43 -07:00
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
57c8d82c9e
Fix llTeleportAgentGlobalCoords
2013-06-02 23:53:20 +02:00
e2d4cb870e
Unsit seated avatars when an object is deleted
2013-06-02 23:53:07 +02:00
bd87eb90d1
Implement PERMISSION_TELEPORT and the needed checks to make it work.
...
Old auth system still works as well.
2013-06-02 16:28:28 +02:00
07058b044b
BulletSim: experimental movement of physics execution off of heartbeat
...
thread. Off by default until more testing.
Setting "[BulletSim]UseSeparatePhysicsThread=true" causes the physics
engine to be called on its own thread and the heartbeat thread only
handles the reporting of property updates and collisions. Physics frame
rate is about right but physics execution time goes to zero as accounted
by the heartbeat loop.
2013-06-01 14:52:44 -07:00
d7fa9f671e
Adding standard OpenSim header to source files
2013-05-31 22:03:27 -04:00
ba2f13db63
Adding back the BasicProfileModule
2013-05-31 21:19:15 -04:00
8fe2308afc
Merge branch 'avination-current' into ubitwork
2013-05-31 23:18:12 +01:00
217c7d1140
Remove unnecessary m_scenes and m_scene from AsyncCommandManager.
...
These were private and the sole point of use (to know when to load config for the first time) can be done by looking at script engines instead.
2013-05-31 23:00:10 +01:00
921ad8704e
Lock areas of AsyncCommandManager where multiple threads could try to access/update the same static structures simultaneously.
...
This is possible where there is more than one scene (multiple copies of the same script engine) and/or more than one script engine being used.
These operations are not thread safe and could be leading to the exceptions/problems seen in http://opensimulator.org/mantis/view.php?id=6651
This also prevents a small race condition where more than one AsyncLSLCmdHandlerThread could be started.
2013-05-31 22:50:15 +01:00
9589a09eda
Fix multi-wear of alpha and tattoo layers.
2013-05-31 22:02:31 +02:00
70d5c29310
Stop sending velocity to avoid snap-back
2013-05-31 21:55:56 +02:00
00c1586ff8
refactor: Remove unused AsyncCommandManager.PleaseShutdown
2013-05-31 18:12:36 +01:00
bf03523323
Fill in fields with default values on profile creation
2013-05-31 10:40:47 -04:00
924a5df25f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-30 19:20:36 -07:00
e85c70223a
Merge branch 'work' contains UserProfiles with Robust service and updates region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use).
2013-05-30 22:16:42 -04:00
4d32ca19bf
Trigger OnScenePresenceUpdated when the avatar's animations change.
2013-05-30 19:16:36 -07:00
48a175eff7
Add methods to Animation and AnimationSet for easier manipulation and
...
display of groups of animations (Equal(), ToString(), FromOSDArray(), ...).
No functional change to animations.
2013-05-30 19:16:34 -07:00
439f11cc3c
Add region heartbeat start event to complement heartbeat end event.
...
This allows object modification before the usual heartbeat operation.
2013-05-30 19:16:31 -07:00
46335b103e
If an exception occurs in the AsyncCommandManager loop, spit it out to log rather than silently swallowing it.
...
This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
2013-05-30 23:51:35 +01:00
328883700a
UserProfiles
...
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
6b88a665d3
minor: fix warnings in GodsModule that were due to duplicate using statements
2013-05-30 22:43:52 +01:00
12a3b85561
Fix passing of voice distance attenuation to the Vivox voice server.
...
Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance)
Thanks to Ai Austin for spotting this.
2013-05-30 22:20:02 +01:00
669fa3ff9a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
8f9a726465
If on a sit request we sit the avatar on a different prim in a linkset for some reason (e.g. because it has a sit target), then send the actual sit prim UUID to the viewer rather than the requested one.
...
This purports to fix the issue described in http://opensimulator.org/mantis/view.php?id=6653 where the camera can end up following the requested sit prim rather than the actual.
The original spot was by Vegaslon, this commit just goes about it in a slightly different way
This commit also makes m_requestedSitTargetUUID to be the actual UUID, which is consistent with m_requestedSitTargetID which was already doing this.
However, this adjustment has no practical effect since we only currently need to know that there's any requested sit UUID at all, not which one it is.
2013-05-30 19:27:20 +01:00
cc7aa88b26
Try caching the user name for a new agent earlier on in the process of establishing a connection, to see if this helps with "Unknown UserUMMTGUN" issues.
...
The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding.
However, in theory the incoming agent should have made that binding before any such request is triggered.
So moving this binding to an earlier point in the process to see if this makes a difference.
Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache.
This relates to http://opensimulator.org/mantis/view.php?id=6625
2013-05-29 23:08:54 +01:00
f9ee9efb97
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-29 22:40:51 +01:00
4898f18f89
Add HG regression TestCachedUserNameForNewAgent()
2013-05-29 21:28:38 +01:00
4709436a6c
retouch prim stopped condition test
2013-05-29 20:23:52 +01:00
a6b964aa11
removed spurius ref to ode.dll from odeapi
2013-05-29 19:51:45 +01:00
d5b1baffec
correction to previus comment: all parameters but gravity modifier have
...
efect on all prims.
2013-05-29 06:45:25 +01:00
269febc87e
let gravity modifier, friction, restitution and density changes be applied
...
to prim. Only have efect on root prim. Density doesn't get effect
imediatly, only on next change of size or shape. density change
implies a full body rebuild to be done later, after reducing the number
of sets sop does. Other parameters should work. **** mainly untested ***
2013-05-29 06:32:26 +01:00
233b9ec4d7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-28 20:59:54 -07:00
7e1c7f54c7
First change in Vivox for ages! -- added a lock to serialize calls to vivox servers. This may ameliorate things when lots of avies arrive in a sim at about the same time. Turns out that there are 4 http requests per avie to Vivox.
2013-05-28 20:59:25 -07:00
1cf24b7092
make sure friction slip parameters are zero ( or other value ) and not
...
default cmf
2013-05-29 04:47:59 +01:00
0882846770
missing file
2013-05-29 02:21:02 +01:00
f00ecf5fe7
missing files
2013-05-29 02:18:05 +01:00
4e72cf9ee2
*** DANGER TESTING **** changed prims mesh generation hopefully removing
...
spurius faces. CHanged several aspects. Fixed prims inertia that was too
low, still using box as model. Increased number of quickstep SOR
iterations to 15. Keep it 15 even on heavy load ( will only jump
simulation time).
2013-05-29 02:08:14 +01:00
ae0d6ab28a
BulletSim: don't zero motion when changing vehicle type.
...
Some vehicle scripts change type on the fly as an easy way of setting
all the parameters (like a plane changing to a car when on the ground).
2013-05-28 09:19:08 -07:00
7c3a46ccea
BulletSim: default using mesh asset hulls to 'true'. This means that,
...
if the mesh asset specifies physics hulls, BulletSim will fetch and
use same rather than approximating the hulls. If physics hulls are not
specified, the representation will fall back to the regular physics mesh.
2013-05-27 14:38:59 -07:00
0c35d28933
BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs
...
which recompute GImpact shape bounding box after creation as Bullet
doesn't do that itself (something it does for nearly every other shape).
Now, physical prims without cuts become single mesh convex meshes. Physical
prims with cuts become GImpact meshes. Meshes become a set of convex
hulls approximated from the mesh unless the hulls are specified in the
mesh asset data. The use of GImpact shapes should make some mechanical
physics more stable.
2013-05-26 17:35:12 -07:00
a348c8e44a
Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
2013-05-26 14:11:48 +02:00
533bbf033d
Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
...
This will require all money modules to be refactored!
2013-05-25 02:08:54 +01:00
ec22c84cb1
Merge branch 'master' into careminster
2013-05-25 02:00:22 +01:00
2b87fb73a9
Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminster
2013-05-25 02:00:02 +01:00
0086c3b5fb
Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
...
This will require all money modules to be refactored!
2013-05-25 01:58:50 +02:00
1821372634
Meshmerizer: remember to add the copied hull verts to the list of hulls.
2013-05-24 16:32:19 -07:00
5f1f5ea5ab
BulletSim: add VehicleInertiaFactor to allow modifying inertia.
...
Another parameter for vehicle operation tuning.
Default to <1,1,1> which means nothing is different under normal use.
2013-05-24 16:24:16 -07:00
4979940def
BulletSim: properly set mesh hash key in use tracking structure.
...
Shouldn't see any functional difference.
2013-05-24 16:23:10 -07:00
81a6c39781
Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.
...
Default to off.
To turn mesh parsing DEBUG detail logging on, add
[Mesh]
LogMeshDetail=true
to the INI file.
2013-05-24 16:20:26 -07:00
a087dbed7f
One more appearance change: drop sending the SendAppearance packet
...
to avatar when it becomes root. This packet shows up in the viewer
logs as an error and appears to cause problems for completing the
texture rebake process for v1 viewers in some cases.
2013-05-24 13:26:07 -07:00
bb0ea25090
Protect one more update of the baked texture hashes.
2013-05-24 13:25:25 -07:00
681fbda4b6
This is an experimental patch that adds support for comparing texture
...
hashes for the purpose of accurately responding to AgentTextureCached
packets. There is a change to IClientAPI to report the wearbles hashes
that come in through the SetAppearance packet. Added storage of the
texture hashes in the appearance. While these are added to the
Pack/Unpack (with support for missing values) routines (which means
Simian will store them properly), they are not currently persisted in
Robust.
2013-05-24 13:18:16 -07:00
440905ad14
change a hull debugging message to Debug instead of Info
2013-05-24 10:31:14 -07:00
21a3a81c7a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-24 01:54:28 -07:00
0cdea5c2f3
correct some errors in decoding of mesh asset convex decomposition data
2013-05-24 01:53:37 -07:00
e2e839a0cd
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
2013-05-24 01:11:49 +01:00
eb2bd9d203
minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy()
...
As a struct, Vector3 has already been cloned by MemberwiseClone()
2013-05-24 00:46:58 +01:00
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
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
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
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
df2a0fec5f
Comment out log message about looking for asset data in remove asset service for now, in order to reduce log levels in a test region with many hg origin avatars
2013-05-14 20:11:58 +01:00
ce979552fd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 19:45:35 +01:00
e9847a4dbd
Comment out some debugging item permission messages since these are highly noisy on the console.
...
Please re-enable when required
2013-05-14 19:44:41 +01:00
f8bb90d963
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 09:07:20 -07:00
91091c3e54
Second take at HGTP-mesh bug: delay sending the initial data only for agents that are coming via TP (root agents)
2013-05-14 09:06:58 -07:00
03fddb301b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 08:49:41 -07:00
b135f1d58a
BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you are running.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-14 08:48:40 -07:00
645da54f25
Revert "HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!"
...
This reverts commit f32a21d967
2013-05-14 08:47:18 -07:00
66c328f51b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 08:12:23 -07:00
f32a21d967
HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!
2013-05-14 08:12:01 -07:00
c86e828dbf
BulletSim: add a lock to try and catch a native shape creation/destruction
...
race condition.
2013-05-13 13:30:44 -07:00
15360cbb6b
BulletSim: add adjustment for avatar capsule height scaling. Makes
...
avatar standing on ground view better and enables tuning.
2013-05-13 13:30:42 -07:00
45f37e11ad
BulletSim: use heightmap terrain when using BulletXNA.
...
Output messages on features disabled when using BulletXNA.
2013-05-13 13:30:40 -07:00
4194d935ec
Fixed mantis #6609 -- LoadPlugin error messages on Robust.
2013-05-13 13:07:39 -07:00
af1fa95875
Groups: Improve error handling on remote connector.
2013-05-13 11:36:17 -07:00
25fea82049
Fixes mantis #6636 -- Groups
2013-05-13 07:29:17 -07:00
f9daf921f7
Explicitly zero avatar velocity on sit
2013-05-13 03:29:11 +02:00
296b43f597
Small adjustments to the floater module
2013-05-13 02:15:48 +02:00
e8f4c7128f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-05-12 03:24:57 +01:00
a4431381fa
Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs about who has permission to set home where.
2013-05-11 07:58:14 -07:00
3f6071ce3a
Guard against trying to access terrain heights out of bounds. Clamp to sim.
2013-05-11 16:16:02 +02:00
8ade6fa617
Refactor to get closer to core
2013-05-11 16:15:39 +02:00
ab4d530462
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-11 07:15:31 -07:00
48f8b884c3
Handle SetHome properly
2013-05-11 07:15:09 -07:00
13cd8c17d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2013-05-11 02:35:26 +01:00
55c9bc15e5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-05-11 01:29:30 +01:00
81d8deb1a8
Send up the part missing from the Avination Estate commit.
...
Warning - contains a small migration.
2013-05-11 01:27:37 +01:00
a42bb799cc
BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie
...
is in a region. This fixes the high CPU usage for regions with nothing
else going on.
2013-05-10 14:48:52 -07:00
a1031772eb
Delete debug message
2013-05-10 08:09:26 -07:00
ff0332730d
Implement delete key for local console
2013-05-09 23:11:37 +01:00
292a6037ad
minor: Remove unnecessary code that was generating warning in TestXInventoryDataPlugin
2013-05-09 22:48:10 +01:00
0e6ad94829
minor: Remove mono compiler warning in RemoteAdminPlugin
2013-05-09 22:44:45 +01:00
9978f36d9f
Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().
...
This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction.
This looks to address http://opensimulator.org/mantis/view.php?id=6600
2013-05-09 22:43:16 +01:00
b4a6f2195d
Only send one kill object to the deleter when they derez an object rather than two.
...
Extend regression test to check this.
2013-05-09 18:53:34 +01:00
3290cd09d3
remove pointless region handle paramter from IClientAPI.SendKillObject()
2013-05-09 18:12:17 +01:00
2cb2f1d7e3
Fix issue where objects removed via llDie() would not disappear for users looking in from neighbouring sims.
...
This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason.
Added regression test for this case.
This fixes http://opensimulator.org/mantis/view.php?id=6627
2013-05-09 18:02:19 +01:00
2b0b9f3e6c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-09 18:01:49 +01:00
641c636790
minor: Simplify test setup in SceneObjectDeRezTests since permissions module doesn't need different configuration anymore
2013-05-09 16:43:16 +01:00
182ea00cb3
Application support:
...
Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
2013-05-09 10:50:18 -04:00
cdaceea5a6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-05-08 21:51:48 +01:00
543d1fe70b
Guard the scene list when estates are updated
2013-05-08 21:14:52 +01:00
33aaa40bee
Adds an event and a method so that handling of the CachedTexture
...
packet can be pulled out of LLClientView and moved to
AvatarFactory. The first pass at reusing textures (turned off by
default) is included. When reusing textures, if the baked textures
from a previous login are still in the asset service (which generally
means that they are in the simulator's cache) then the avatar will not
need to rebake. This is both a performance improvement (specifically
that an avatars baked textures do not need to be sent to other users
who have the old textures cached) and a resource improvement (don't
have to deal with duplicate bakes in the asset service cache).
2013-05-08 13:13:51 -07:00
bda4565067
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2013-05-08 20:59:44 +01:00
6f5222e863
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-07 18:02:25 -07:00
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
ac6dcd35fb
Bulletsim: and the rotational friction.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-07 07:14:10 -07:00
f247ae1a75
BulletSim: Another way to create vehicle framed friction.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-07 07:14:06 -07:00
ddd97cb78e
BulletSim: normalize quaternian rotations when building compound linksets.
...
Attempt to fix vehicles being twisted off the ground when they go physical.
2013-05-06 18:06:34 -07:00
84118c5735
BulletSim: properly free references to simple convex hull shapes. Didn't
...
loose memory since shapes are shared but did mess up usage accounting.
2013-05-06 18:05:37 -07:00
1c6b8293d7
Step 3: Commit the Avination XEstate estate comms handler
...
This adds estate-wide Teleport Home and Teleport All User Home as well
2013-05-07 00:52:40 +01:00
5d5edde429
Step 2: commit the IEstateModuleInterface changes needed
2013-05-07 00:37:45 +01:00
4c83b5e719
Step one of estate settings sharing - port the Avination Estate module (complete module) as changes are too extensive to apply manually
2013-05-07 00:31:11 +01:00
93e1986d69
BulletSim: apply linear and angular friction in vehicle coordinates
...
and not world coordinates.
2013-05-06 16:48:01 -07:00
54d0cd85ad
Merge branch 'master' into careminster
2013-05-07 00:30:59 +01:00
b36e123c7f
Merge branch 'master' into careminster
2013-05-06 23:47:19 +01:00
e94b240f3d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-05-06 23:42:39 +01:00
045aaa838a
BulletSim: remove friction calcuation from BSMotor and move linear and
...
angular friction computation into linear and angular movement code.
The friction wasn't being applied properly. This will make it so vehicles
don't drift as much and the drift is tunable by changing the friction
timescales.
2013-05-06 13:32:26 -07:00
bf31896983
BulletSim: simplify parameter specification by reducing the number of
...
specifications required for simple properties with defaults.
2013-05-06 13:32:24 -07:00
f9fb1484aa
BulletSim: extend BSActorLockAxis to allow locking linear movement in
...
addition to angular movement. Not enabled by anything yet.
2013-05-06 13:32:22 -07:00
90f03ccd42
Added new method to Remote Admin for reloading the estate settings. This is meant to be called when some other program has changed the data on the backend.
2013-05-06 11:47:55 -07:00
a81ddf3d70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-06 09:18:17 -07:00
ad00466483
Minor reordering of operations on NewUserConnection. The agent circuit needs to be added earlier for some of the checks to work correctly.
2013-05-06 09:17:54 -07:00
cbae04ba97
Remove dumb "Region found!" message from map search
2013-05-06 06:15:47 +02:00
a8faed6f76
Implement llSetContentType using the new OpenID auth support for authentication
2013-05-05 22:01:07 +02:00
3aa83738e2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-05-04 01:22:12 +01:00
2332453974
Add RegionManager level and the ability to use literal XML to the dynamic floater module
2013-05-04 00:45:27 +02:00
4904d40138
Add llGetPhysicsMaterial
2013-05-04 00:44:47 +02:00
1ffa69f691
Merge branch 'master' into bulletsim4
2013-05-03 14:25:52 -07:00
5d25bb3084
BulletSim: zero vehicle motion when changing vehicle type.
...
Rebuild compound linkset of any child in the linkset changes shape.
Comments and better detailed logging messages.
2013-05-03 14:23:53 -07:00
5d93c99e8c
Fix possible race condition with local region cache if a region was added after startup.
2013-05-03 18:56:58 +01:00
7ca42d5711
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-03 18:51:29 +01:00
304c5d4a8b
On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created.
...
This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618
2013-05-03 18:48:50 +01:00
4042c82a72
BulletSim: prims with no cuts created with single convex hull shape.
...
Parameter added to enable/disable this feature.
2013-05-02 12:27:30 -07:00
d9c3947824
BulletSim: Rebuild physical body if physical shape changes for mesh and hull.
...
Properly rebuilds collision caches.
Release asset data fetched when building mesh or hulls.
2013-05-02 10:06:12 -07:00
a9480aed85
Merge branch 'master' into bulletsim4
2013-05-02 07:02:28 -07:00
ed46b42fea
BulletSim: fix crash when mesh asset wasn't available when meshing
...
the first time.
Debugging added for mesh/hull asset fetch.
2013-05-01 17:16:46 -07:00
0378baed35
BulletSim: rework LinksetCompound to work with new BSShape system.
...
Not all working yet.
2013-05-01 17:15:54 -07:00
e3d9d5566a
Fix inventory issue
...
Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory.
2013-05-01 18:51:43 -04:00
d982d24938
Fix the long standing bug of items being delivered to lost and found or trash when takig copy.
...
This bug was recently aggravated through the perms changes required for the
export permission.
2013-05-01 21:42:51 +01:00
8c5445b774
Merge branch 'master' into careminster
...
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +01:00
c6d50cd431
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-05-01 21:37:17 +01:00
b26276c8c4
Fix the long standing bug of items being delivered to lost and found or trash when takig copy.
...
This bug was recently aggravated through the perms changes required for the
export permission.
2013-05-01 21:35:50 +01:00
fca4e4ec7c
Merge branch 'master' into bulletsim4
2013-05-01 12:08:12 -07:00
81a90e30c6
Add in-code exaplanation for the change in cancellation signalling in STP 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306
2013-05-01 19:29:46 +01:00
206fb306a7
Update SmartThreadPool to latest version 2.2.3 with a major and minor change.
...
SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool
This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those.
However, two changes have been made to stock 2.2.3.
Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified.
This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled.
Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch
The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
2013-05-01 19:01:43 +01:00
ac135c649c
Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
...
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:50:23 +01:00
b89d18e6f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-04-30 23:45:38 +01:00
958a500692
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2013-04-30 23:40:06 +02:00
0af1d8fe19
Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
...
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:35:59 +02:00
46ae84cfba
BulletSim: fix error messages created while an avatar has no initial
...
collisions. Usually happens when logging in an avatar that had been
previously flying. Uninitialized variable.
2013-04-30 13:10:15 -07:00
7cdb07b386
BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working yet.
2013-04-30 11:42:11 -07:00
d322625f90
BulletSim: Add non-static BSShape.GetReference for getting another reference
...
to an existing shape instance.
BSShapeNative rebuilds shape for all references.
BSShapeCompound returns another reference copy if the compound shape
already exists (for linksets).
2013-04-29 17:30:54 -07:00
15a3f80e2e
BulletSim: LinksetCompound work to disable collision for root and
...
child prims so compound shape can do all collisions.
Don't try to build a compound linkset for non-physical linksets.
Remove and replace root body when compound shape is added so collision
cache is rebuilt.
2013-04-29 17:30:38 -07:00
5a4cb539d2
Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
...
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-30 01:25:21 +01:00
3ce198165c
minor: remove some mono compiler warnings in ServicesServerBase
2013-04-29 22:21:57 +01:00
537b243360
minor: Eliminate warning in LLimageManagerTests by properly calling through to OpenSimTestCase.SetUp()
2013-04-29 22:18:11 +01:00
67789201c3
Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests
2013-04-29 22:14:13 +01:00
0beccf23c0
Add regression test for inventory item give, reject and subsequent trash folder purge by receiver.
...
This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
2013-04-29 21:11:44 +01:00
a7cbb9edc9
Add regression test for offer, accept and subsequent receiver delete of an item offered via instant message.
2013-04-29 20:50:49 +01:00
12054aaa9f
Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
...
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-29 17:14:44 +01:00
92ee288d66
BulletSim: remove trailing white space to make git happier. No functional changes.
2013-04-29 07:54:50 -07:00
ad1787770e
BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_physicsScene' to match coding conventions and reduce confusion.
2013-04-29 07:38:55 -07:00
21ec434688
BulletSim: first cut at new linksetCompound shape building.
2013-04-29 07:38:51 -07:00
f2d408829b
BulletSim: fix crash when creating new hull.
2013-04-29 07:38:47 -07:00
2da8e60b6d
BulletSim: code for creating the avatar capsule shape.
2013-04-29 07:38:44 -07:00
e5582939fd
BulletSim: massive refactor of shape classes. Removed shape specific code from BSShapeCollection. Using BSShape* classes to hold references to shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods and have each class specify shape type. Disable compound shape linkset for a later commit that will simplify linkset implementation.
2013-04-29 07:38:40 -07:00
890cb6a293
BulletSim: complete BSShape classes.
2013-04-29 07:38:35 -07:00
3ff7391495
Some more pieces of Avination's ban system - if an avatar isn't allowed on any
...
parcel in the sim, keep them out entirely.
2013-04-29 00:55:34 +01:00
7c729e1519
Merge branch 'master' into careminster
2013-04-29 00:38:20 +01:00
4275d7a839
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
...
Conflicts:
bin/Regions/Regions.ini.example
2013-04-28 19:03:39 +02:00
a517e597f5
Fix wrong sql statement in offline im.
2013-04-28 09:03:09 -07:00
a49c5291dc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-27 21:24:07 -07:00
222f530411
Added an interface to an external ban service. With this commit, the interface is used only in Hypergrided worlds (Gatekeeper), although in those, it applies to both local and foreign users. The Ban service itself is not in core; it is to be provided externally.
2013-04-27 21:23:29 -07:00
90a6891a7d
Better error reporting
2013-04-27 10:34:23 -07:00
f675d465b2
Make method virtual
2013-04-27 10:34:13 -07:00
12599c34e2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-04-27 17:57:22 +01:00
cbb3bb62da
Unbreak the sample money module
2013-04-27 17:56:39 +01:00
ef08ab68a7
Small oversight in EconomyDataRequest - this would have affected everyone NOT using a money module.
2013-04-27 17:42:54 +01:00
3fcac2ba7b
Controller module for dynamic floaters (WIP)
2013-04-27 01:20:03 +02:00
2262b13048
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-25 17:02:32 -07:00
0e162511cf
Groups: make some methods protected.
2013-04-25 17:01:57 -07:00
40036ca05f
Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
...
Sending the reply requires having the IClientAPI.
2013-04-25 21:37:40 +01:00
fb8aa22084
Merge branch 'master' into careminster
2013-04-25 21:37:25 +01:00
03c9d8ae4f
Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
...
Sending the reply requires having the IClientAPI.
2013-04-25 21:35:18 +01:00
5d0a8ff391
Change copyright notice on DynamicMenuModule to proper BSD
2013-04-25 20:48:12 +01:00
c6628b1c76
Merge branch 'master' into careminster
2013-04-25 20:47:55 +01:00
3bc8017464
Recover a lost "virtual". Downstream projects need this.
2013-04-25 09:23:15 -07:00
c10405330d
UUIDGatherer now includes UUIDs which reference texture assets used as materials
2013-04-24 20:43:15 -07:00
0e22021c65
Make the kicked user's avie truly disappear when it's god-kicked.
2013-04-24 19:00:41 -07:00
2093d87e20
Make the kicked user's avie truly disappear when it's god-kicked.
2013-04-25 02:48:49 +01:00
ec4f981f1d
Adding the dynamic menu module which allows registering new menu options in compliant viewers
2013-04-25 01:52:34 +01:00
5cd77a460c
Commit Avination's God Kick feature.
2013-04-25 00:51:57 +01:00
3934b779b8
Adding the dynamic menu module which allows registering new menu options in compliant viewers
2013-04-25 01:39:22 +02:00
e39156c656
Send 503 when throttling textures
2013-04-25 01:38:21 +02:00
51e05dcb5b
Gods module cleanup
2013-04-25 01:37:18 +02:00
6f3c905744
Add Avination's support for parcel eject and freeze
2013-04-25 00:24:48 +01:00
d36a52ea55
Merge branch 'master' into careminster
2013-04-25 00:22:28 +01:00
1868680848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-24 12:46:23 -07:00
70081a40a4
Bug fix: compare tolower. This should fix the issue where HG visitors currently in the region were not being found by the avatar picker window.
2013-04-24 12:45:19 -07:00
c22a2ab7d2
BulletSim: partial addition of BSShape class code preparing for
...
different physical mesh representations (simplified convex meshes)
and avatar mesh.
2013-04-24 08:05:42 -07:00
e324f6f3f0
BulletSim: update DLLs and SOs to they have no dependencies on newer
...
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
2013-04-24 08:03:45 -07:00
522ab85045
BulletSim: improve avatar stair walking up. Add more parameters to control force
...
of both position change and up force that move avatars over barrier.
Default parameters are for steps up to 0.5m in height.
2013-04-23 18:31:12 -07:00
115e0aaf83
Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if any number of avatars other than 1 was in the region.
...
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
2013-04-23 21:55:51 +01:00
e1ac683154
BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's check for an object being linked into the world does not work for Bullet's ghost objects so BulletSim was deleting the object while it was still linked into the physical world structures.
2013-04-22 16:50:06 -07:00
293a024c14
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:39:08 +01:00
671a97ef76
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:28:41 +02:00
a7a92e7339
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:26:04 +02:00
6571e7ead2
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:24:41 +02:00
231c298ca5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
bin/OpenMetaverse.StructuredData.XML
bin/OpenMetaverse.XML
bin/OpenMetaverseTypes.XML
2013-04-21 14:11:39 +01:00
69f07fdb34
Materials persistence via SceneObjectPart.dynAttrs. This appears to work across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving.
2013-04-20 23:39:07 -07:00
233f761779
handle PUT verb for RenderMaterials Cap
2013-04-20 02:08:22 -07:00
258804cc04
RenderMaterials POST Cap now return material entries when invoked with an OSDArray of MaterialIDs
2013-04-19 22:19:57 -07:00
9ae24cac2f
Materials-capable viewers send ImageUpdate packets when updating materials that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed.
2013-04-19 00:35:06 -07:00
06829c4082
remove default parameter value that apparently mono cant handle
2013-04-18 01:29:50 -07:00
d5419f0a46
Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet.
2013-04-18 01:03:19 -07:00
7c839f176f
amend previous commit, a line was left out
2013-04-17 23:14:28 -07:00
53122fad40
Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential crash with Server-side baking enabled viewers
2013-04-17 23:10:02 -07:00
ce043c5141
Allow changes to TextureEntry to propagate to viewers when MaterialID changes
2013-04-17 22:41:12 -07:00
d3f288e27b
Merge branch 'master' into careminster
2013-04-16 22:37:47 +01:00
c5de9840b0
refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Stop().
...
This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
2013-04-16 21:58:24 +01:00
7cf377fff0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-04-10 13:20:55 +01:00
5f2cbfc0fd
BulletSim: fixing problems with llMoveToTarget. Not all fixed yet.
2013-04-09 18:00:29 -07:00
b53713cdda
BulletSim: some formatting changes.
2013-04-09 18:00:27 -07:00
9cc41d5118
Another algorithm for AngularVerticalAttraction. This one Takes into account all rotations before it and makes the corrections more close to the time that sl does.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-04-09 18:00:25 -07:00
59135c9a31
BulletSim: add Bullet HACD library invocation. Turned off by default as not
...
totally debugged. Updated DLLs and SOs with more debugged HACD library code.
2013-04-09 18:00:23 -07:00
17fd075f39
BulletSim: fix problem where large sets of mega-regions weren't registering
...
all the terrain with the base region.
2013-04-09 18:00:20 -07:00
148e46563f
minor: fix mono compiler warning in ScriptsHttpRequests.cs
2013-04-10 00:07:58 +01:00
29e28f4b84
minor: remove mono compiler warnings in InventoryAccessModule
2013-04-10 00:05:03 +01:00
e20b0d5695
minor: Make exceptions thrown by MySQLAssetData more consistent.
2013-04-10 00:03:37 +01:00
06068444e2
Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02:34:51 2013)
2013-04-09 23:21:13 +01:00
8690a08881
minor: Log an exception if we aren't able to delete a script state file rather than simply ignoring it.
...
This should never normally happen but if it does then it can be valuable diagonstic information.
2013-04-09 23:02:11 +01:00
aab2b032aa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-09 22:45:00 +01:00
8e04c752fc
If OpenSimulator is writing a PID file and finds the file already present on startup, logging an error since this is commonly due to an unclean shutdown.
...
Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
2013-04-09 22:38:47 +01:00
99f39836a1
BulletSim: moving comments around. No functional change.
2013-04-08 06:27:45 -07:00
a7a1b8b7e9
BulletSim: clean up actor code so routines use the same coding pattern.
...
Fix a few enabling problems.
2013-04-08 06:27:44 -07:00
fe16dc09da
BulletSim: complete movement of physical object action code out of the
...
physical object and into actors for setForce, setTorque, hover, lock
axis and avatar move.
2013-04-08 06:27:43 -07:00
c7cd077e55
Optimize the number of Simian calls to get the initial presence
...
information for the friends list. This is a pretty big performance
improvement on login. Note that you must upgrade simian to incorporate
the corresponding GetSessions call.
2013-04-07 17:31:44 -07:00
7f070236f7
Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.
...
This fixes the combined bounding box location for regions bigger than 256x256.
It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead.
It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region.
Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595 . Thanks!
2013-04-06 02:34:51 +01:00
0f008d5f7d
When rezzing a coalesced object, check adjust position of all components.
2013-04-06 01:44:06 +01:00
d2367968e4
* In between the fog, a moment of clarity. This fixes mantis 6570
2013-04-04 19:10:23 -04:00
c6b0942f97
Merge branch 'master' into careminster
2013-04-05 00:03:33 +01:00
6a5f6ac04e
Merge branch 'master' into careminster
2013-04-04 03:17:57 +01:00
b16a560b77
Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster
2013-04-04 03:17:38 +01:00
f064075a85
Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last user login time rather than serializing the DateTime directly which generates a set of unexpected fields.
...
lastlogin return is in unix timestamp format.
2013-04-04 01:06:57 +01:00
f281a994e8
refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more simply iterate through pending requests without unnecessary checks.
2013-04-04 00:49:07 +01:00
831e4c3850
Fix bug where outstanding llHTTPRequests for scripts were not being aborted when they were deleted.
...
This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID.
This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread
so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself.
This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
2013-04-04 00:36:15 +01:00
94d44142e3
minor: Stop falsely logging that a teleport was being aborted on client logout even when no teleport was active.
2013-04-03 00:48:36 +01:00
7bf1986e91
Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent values could be returned if the sit orientation was changed whilst the property was being fetched.
2013-04-03 00:24:33 +01:00
97f0c9da84
Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than one that could change whilst the method is being executed.
2013-04-03 00:23:20 +01:00
c0319daa40
fix minor race condition in SOP.SitTargetPositionLL where inconsistency could occur if the sit target position changed whilst the property was fetched
2013-04-03 00:09:28 +01:00
3332af4060
minor: Make SOP.UpdateOffset() more consistent by checking against the same old OffsetPosition rather than one which may vary if it simultaneously changes.
2013-04-03 00:01:06 +01:00
4bc5a7aa19
Merge branch 'master' into careminster
2013-04-02 23:53:23 +01:00
a3c723ee30
Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running
...
No need to create new Vector3s since these are structs.
2013-04-02 23:48:55 +01:00
c10331c8c2
Merge branch 'master' into careminster
2013-04-02 23:48:01 +01:00
41a652f6bd
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-04-02 23:47:19 +01:00
68c8633ba1
BulletSim: create axis lock constraint with proper orientation and
...
enable axis lock functionality.
2013-04-02 06:40:12 -07:00
17aef1c883
BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD
...
mesh to hull conversion calls in place but code not working. Update
BulletSim DLLs and SOs for new API and HACD code.
2013-04-01 18:03:11 -07:00
ebc1209fc9
BulletSim: rearrange mega-region terrain code to make the thread flow
...
a little clearer.
2013-04-01 18:03:09 -07:00
2bfe60e2fb
Use Output instead of OutputFormat in appropriate places of XEngine status reporting.
2013-04-02 01:28:16 +01:00
69bc37acd6
minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.UpdateUserInventoryWithAttachment()
2013-04-02 01:00:55 +01:00
0dce496499
Fix what appears to be a bug in HGUserManagementModule where it enables on the base.Name rather than its own Name.
2013-04-02 00:55:00 +01:00
600087ab49
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-02 00:46:53 +01:00
4153cfbf14
Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is either not syntactical or unnecessary.
...
May fix http://opensimulator.org/mantis/view.php?id=6593
2013-04-02 00:45:29 +01:00
84eb25da23
BulletSim: stop an avatar from moving if standing on a stationary
...
object. This will stop avatars from sliding down steep terrains
or objects while still allowing an avatar to be moved if standing
on a moving object.
2013-03-31 22:19:44 -07:00
933ac60746
BulletSim: not quite functional axis lock code.
2013-03-31 22:19:43 -07:00
7d50015a74
BulletSim: start the renaming of local variables to m_ form to match the OpenSim coding conventions.
2013-03-31 22:19:42 -07:00
75b8cf428e
BulletSim: fix line endings in BSActor*
2013-03-31 22:19:42 -07:00
747ece59d2
BulletSim: convert BSDynamic to a BSActor and change BSPrim to set
...
up the vehicle actor.
2013-03-31 22:19:41 -07:00
2c581cae2a
BulletSim: Add physical 'actors' that operate on the physical object.
...
Add first 'actor' for locked axis.
2013-03-31 22:19:41 -07:00
9b83e53b28
Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
...
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 21:59:44 +01:00
ae833af3a9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-31 20:56:13 +01:00
f142e1f394
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-03-31 20:27:46 +02:00
4bf9c4bbb8
Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
...
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 20:25:32 +02:00
64a56059b1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-30 21:19:10 +00:00
9fee431cc8
In the flotasm asset cache, if we get a request for a file that we're actively writing, simply return null instead of first logging an exception.
2013-03-30 01:21:16 +00:00
f8785b5f47
refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods
2013-03-30 00:29:52 +00:00
76629289f0
refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2
2013-03-29 23:59:21 +00:00
cbc9ae898c
Added missing functionality (mainly custom headers) to llHTTPRequest.
2013-03-29 23:32:11 +00:00
d5d6a274a7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-29 23:28:47 +00:00
023faa227e
Check viewer 2/3 attachment calls against avatar appearance attachment data rather than actually attached objects
...
By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side.
Initiating simulator-side is always necessary for version 1 viewers.
This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
2013-03-29 23:10:28 +00:00
f2f8248178
Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 02:42:47 +00:00
23ae4c0a4d
Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments.
...
This was because the script resumption in AttachmentsModule was firing the attach event instead.
Had to reinstate the code in 285bd3ahttp://opensimulator.org/mantis/view.php?id=6578
2013-03-29 02:21:38 +00:00
e9eb837347
Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster
2013-03-29 02:21:20 +00:00
3696a668a8
Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster
2013-03-29 02:21:06 +00:00
7d466d36a3
Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster
2013-03-29 02:20:47 +00:00
e7d76c91c2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 02:19:12 +00:00
05810e48b0
Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-29 02:15:47 +00:00
c93f67b632
Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 01:58:57 +00:00
73710413cd
Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminster
2013-03-29 01:52:58 +00:00
7d5eadf753
Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster
2013-03-29 01:52:45 +00:00
6954024fb2
Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster
2013-03-29 01:52:29 +00:00
abe885b3fe
Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster
2013-03-29 01:52:18 +00:00
120903efb6
Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 01:50:34 +00:00
e89bcf4f77
Revert "Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way."
...
Unfortunately fails on Nebadon's system right now. Needs investigation. May put in a temproary option for experimentation soon.
This reverts commit d87ddf50fc
2013-03-29 01:34:31 +00:00
4dfffa1df3
Add Location (relative), Rotation (Relative) and Rotation (World) to "show part" and other related console commands
2013-03-29 01:31:37 +00:00
d87ddf50fc
Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way.
...
On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up.
Trying this change to see if this is true for other people.
2013-03-29 01:16:29 +00:00
4cb8967f0a
Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster
2013-03-29 01:08:33 +00:00
285bd3abc8
Eliminate code which tries to restart attachment scripts in ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
2013-03-29 00:49:55 +00:00
c92654fb43
Stop attempts to update/add existing attachments in user inventory when teleporting between regions.
...
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
2013-03-28 23:57:35 +00:00
2b142f2f9e
Add "debug attachments" console command to allow highly verbose attachment logging to be switched on and off.
...
Default is off.
2013-03-28 23:09:35 +00:00
feffc8081d
minor: remove some mono compiler warnings from EntityTransferModule
2013-03-28 22:56:30 +00:00
03e421bf3d
minor: comment out unused Scene.AgentCrossing() to reduce code complexity
2013-03-28 22:55:13 +00:00
4ad9b27530
If the viewer has already rezzed any attachments itself, then ignore the simulator-side rez attachments call.
...
This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
2013-03-28 22:51:59 +00:00
3b377f16b2
Fix regression tests by making a new NPC always trigger simulator side attachment code when created.
...
Regression from previous commit c2093ccc
2013-03-28 22:44:59 +00:00
e97567e227
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-28 22:35:24 +00:00
c2093ccce1
Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary.
...
This is to simplify the code (no tricky 'wasChild' signalling required)
and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers)
and the viewer-side attaching the v3 viewers perform.
2013-03-28 22:07:58 +00:00
6a9630d2bd
BulletSim: fix race condition when creating very large mega-regions.
...
The symptom was exceptions while creating physical terrain.
Reduce default terrain mesh magnification to 2 from 3 because the
higher resolution uses a lot of memory and doesn't solve the terrain
smoothness for vehicles.
Added comments here and there and improved some debugging log messages.
2013-03-28 10:59:18 -07:00
3f9b274180
BulletSim: tweaks to terrain boundry computation. No functional changes.
2013-03-28 10:59:16 -07:00
9ca54d00d8
Add back a log message when we attempt a megaregion auto-reteleport
2013-03-28 02:29:34 +00:00
f548a41fb8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
2013-03-28 02:29:07 +00:00
afd0d6af07
minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if module was enabled.
2013-03-28 02:23:09 +00:00
d9c049fd9f
Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region is removed rather than base.AddRegion()
2013-03-28 02:20:43 +00:00
b05ed4ffa6
Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly in a megaregion, in the same manner at the "teleport user" console command.
...
This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening.
2013-03-28 02:17:32 +00:00
506d5e41bf
On the North and East sides of a megaregion, only consider regions within 256m to be neighbours rather than regions up to 512 distant.
...
This looks like an off-by-one bug since the view distance was already only 256 on the west and south sides.
This reduces the number of child agents being logged into regions neighbouring a megaregion.
2013-03-28 01:54:11 +00:00
617637c788
minor: Fix usage error message for "debug eq" console command
2013-03-28 01:41:41 +00:00
b5b01e5bb5
Make HGLureModule track god like lures as well as normal lures, to see if this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active.
2013-03-28 01:37:52 +00:00
876d0d310f
Add "show eq" console command to show numbers of messages in agent event queues.
...
For debugging purposes.
2013-03-28 01:36:34 +00:00
f32027f3b5
Remove some Console.WriteLines accidentally left in last commit cfb20f09
2013-03-28 01:08:47 +00:00
cfb20f09a9
refactor: combine the checks for megaregion view range into a single place.
2013-03-28 00:57:43 +00:00
dd7d7683c9
Fix problem with megaregions where teleporting into a different region which already had a child agent would stop the eq working for the agent in the new region.
...
This was because the calculation as to whether a new agent was needed in the receiving region did not take megaregions into account,
unlike the original calculation when the user first teleported into the region.
This meant that on teleport, entity transfer would create a new CAP but this would be ignored by the viewer and receiving region, meaning that the EQ could no longer be used.
This would prevent subsequent teleport, amongst other things.
Currently, regions up to 512m from a megaregion are considered neighbours.
2013-03-28 00:12:48 +00:00
46b765d28e
Merge branch 'master' into careminster
2013-03-28 00:10:51 +00:00
e320046683
Merge branch 'master' into careminster
2013-03-27 01:17:59 +00:00
da5dbaf1d0
Add admin_get_agents xmlrpc method.
...
This allows one to retrieve information about agents from a particular region (name, id, position, etc.)
Similar to output from "show users"
See http://opensimulator.org/wiki/Remoteadmin:admin_get_agents for more details
2013-03-26 23:02:13 +00:00
3072f257f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 23:00:51 +00:00
abde0d4efb
BulletSim: prevent asset fetching loop when the fetched asset fails to mesh.
...
Check for the case where the fetched mesh asset fails meshing (degenerate
triangles or no physical mesh). In this case, the asset is marked 'failed'
and BulletSim doesn't keep trying to fetch over-and-over trying to get a
good asset.
2013-03-26 15:02:10 -07:00
13170ca627
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 20:32:22 +00:00
3f0f313a76
Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars in a linkset.
...
llGetPrimitiveParams() works through PRIM_LINK_TARGET
Setting via llSetLinkPrimitiveParams(), etc. not yet implemented
2013-03-26 20:25:58 +00:00
4365daa8e1
Merge branch 'master' into careminster
2013-03-26 19:06:44 +00:00
e82fab34d7
Implement a pref to turn on the simulator ExportSupported feature entry.
...
This tells the viewer to enable the UI for export permissions.
WARNING: If your inventory store contains invalid flags data, this will result
in items becoming exportable! Don't turn this on in production until it's complete!
2013-03-26 19:00:30 +00:00
5f4c4df227
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-26 03:40:06 +00:00
36c57bac8e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2013-03-26 03:26:28 +00:00
95d0a7d4fa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-03-26 03:26:02 +00:00
285dc554ec
BulletSim: new algorithm for vertical attraction which uses quaternion
...
arithmetic to compute the shortest path between the current tilt
and vertical.
2013-03-25 15:40:46 -07:00
c96a6f1de6
BulletSim: small tweaks and formatting in the parameter fetching code.
2013-03-25 15:40:44 -07:00
953090fd62
BulletSim: fix possible race condition where an prim's asset can be requested quicker than the asset fetcher returns and thus falsely reporting that an asset was not fetched and defaulting the assset to a bounding box.
2013-03-25 15:40:43 -07:00
f783b9169f
BulletSim: parameterize C# HACD hull creation. Add feature of reducing max hull count for simple (non-cut prims) meshes.
2013-03-25 15:40:41 -07:00
128c72a234
Start recording inter-region teleport attempts, aborts, cancels and failures in statistics for monitoring/debugging purposes
...
These are recorded as 'entitytransfer' stats as seen by the "show stats entitytransfer" console command.
2013-03-25 21:53:27 +00:00
c341664c1b
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-24 18:56:28 +01:00
6ce9ed1a64
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-23 23:01:55 +00:00
8669586e18
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-03-23 11:45:52 +00:00
aba66c7112
Make sharing errors not spew and let the cache retry the files
2013-03-23 13:12:41 +01:00
8bc43ea773
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-03-23 11:31:34 +01:00
01636ca900
Fix teleporting into the non-SW 256x256 corner of a megaregion, though currently with a 10 second delay before auto-reteleport to the correct location.
...
This now does a check for border crossing (required to trigger the teleport) immediately in SP.MakeRootAgent().
If left any later, it looks like the physics scene changes the position and stops the cross happening.
If done any earlier, nothing happens because the cross-code currently requires a PhysicsActor to be in place, thuogh it's probably not necessary for this case.
2013-03-23 00:47:59 +00:00
93206ef0fa
Add "show borders" command to show the borders of a region.
...
This is relevant to mega-regions where the borders are very different to a regular region.
Also adds some method doc and other code comments.
2013-03-23 00:45:21 +00:00
c4d9a23f26
Following on from 476a7d3e (which wasn't enough), make chat across regions on different simulators work.
...
Also resolves an issue of multiple chatting if the originating simulators had more than one region and they were neighbours
2013-03-22 01:43:18 +00:00
1f17ef6d3c
Take out a testing sleep I accidentally left in the teleport code from last commit 7471bc7
2013-03-22 01:06:56 +00:00
d5e5c13f3b
Merge branch 'master' into careminster
2013-03-22 01:02:17 +00:00
68b910c1ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-03-22 01:01:24 +00:00
7471bc7775
At strategic points in the teleport process, if the client has simultaneously logged out then do not continue.
...
This aims to reduce any side effects if the process tries to complete after the client has logged back in (e.g. it was delayed due to a slow destination region response).
This introduces a new Aborting entity transfer state which signals that the teleport should be stopped but no compensating actions performed.
2013-03-22 01:00:13 +00:00
476a7d3eee
Implement chat across region borders since we can tell if avatars in neighbouring regions are in range.
2013-03-22 00:03:10 +00:00
e23a0dcc5d
minor: On teleport, signal a child agent before we send the viewer TeleportFinish in order to avoid a theoretical race condition when teleporting to a neighbour.
...
If we do this after TeleportFinish, then it's possible for a neighbour destination to request the source to create a child agent whilst its still treated as root.
This closes the original presence which we don't really want to do.
This is probably okay (albeit with warnings on the console) but afaics there's no reason not to move the child agent signal.
2013-03-21 23:37:23 +00:00
46c833810c
On a teleport, lock m_agentsInTransit whilst we grab the value to check for completion just to be sure we're not using a thread cached version.
2013-03-21 00:46:08 +00:00
cc504eb0d1
Fix SceneManager to use the new automatic property throughout.
2013-03-21 01:44:09 +01:00
4de530af45
minor: disable logging on regression TestCrossOnSameSimulator() that I accidentally left on a few commits ago.
2013-03-20 23:13:12 +00:00
b1cd1d917e
minor: don't bother with the pause before rezzing attachments if we are running regression tests (fire and forget calls launched on the same thread).
...
Also adds code comments as to why this pause exists.
2013-03-20 23:12:13 +00:00
16af5b87f8
Add file missing from last commit 36651be
2013-03-20 23:08:35 +00:00
36651bed71
On the later forms of teleport failure, tell the user if this was because viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion.
...
Also adds regression test for the case where the viewer couldn't connect with the destination region.
Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
2013-03-20 23:01:16 +00:00
8de933ab07
Insert a short delay on the simulator side rezzing of attachments in order to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions.
...
This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar.
This doesn't affect version 1 viewers since this delay is shorter than the login delay.
This doesn't increase the login time since this part of the process was already being performed asynchronously.
This may be a temporary solution.
2013-03-20 02:09:25 +00:00
c0ff5635ba
Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 21:38:00 2013)
...
This break was not connected with the recent attachment code changes.
2013-03-20 02:00:56 +00:00
3cb1c23554
Force a viewer object update for attachments at the end of the final Scene.CompleteMovement() in order to make all multi-attachments appear on the destination region.
...
For some reason, sending updates before this will not have this effect.
This may be something related to some viewers (e.g. LL 3.3.4) or something OpenSimulator isn't getting quite right.
2013-03-20 01:46:50 +00:00
9151b9d233
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-20 01:36:28 +00:00
90b9121e66
BulletSim: change 'degenerate mesh' message from Error to Debug because there
...
seem to be lots of sculpties with this problem while the condition really doesn't
change region operation.
2013-03-19 17:15:24 -07:00
3648164219
Prevent multiple instances of the same item ID being appended to an AvatarAppearance
...
It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID).
However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there.
This commit requires both simulator and service to be updated.
2013-03-19 21:49:29 +00:00
c2e4f8aed5
For the moment, disable the output of the 'scene' statistics in SimExtraStatsCollector
...
and thus for the command 'show stats' because it is ugly and most of the information
is already output in the formatted printout that appears before.
2013-03-19 12:37:44 -07:00
1dd2d432f1
For those people collecting and comparing logfiles from servers scattered
...
around the world, change LogWriter to use DateTime.UtcNow rather than
DateTime.Now.
2013-03-19 11:40:10 -07:00
8360223fed
BulletSim: code to generate a higher resolution terrain mesh. Parameter
...
TerrainMeshMagnification controls number of vertices generated per
heightmap point. Default is 3.
2013-03-19 00:00:03 -07:00
8510f57ad4
BulletSim: add terrain contact processing threshold parameter. Initialize contact processing threshold for static object as well as mesh terrain.
2013-03-19 00:00:02 -07:00
8d9bfda727
Merge branch 'avination' into careminster
2013-03-19 01:24:14 +00:00
566ab7ccf9
Fix merge artefacts
2013-03-19 01:19:33 +00:00
8553a37881
Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-19 01:00:09 +00:00
5b950ca36a
Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster
2013-03-19 00:54:23 +00:00
397379cd3f
Process default attachment point in AttachObjectInternal before we check whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
2013-03-19 00:39:58 +00:00
55ab6f015a
Fix tests for multiattach
2013-03-18 23:48:03 +00:00
5e1f651e21
Merge branch 'master' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:31:27 +00:00
0635d9d174
Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:21:01 +00:00
e4a70b9f9a
Limit each attachment point to 5 items as per spec
2013-03-18 22:56:26 +00:00
d07943c262
Multiattach, part 2
2013-03-18 22:56:17 +00:00
fcecfc81bb
Multiattach, part 1
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-18 22:56:03 +00:00
3611d33b00
Improve rejection of any attempt to reattach an object that is already attached.
...
This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
2013-03-18 22:04:27 +00:00
a7a9a8a614
Fix recent regression where an item worn to an attachment point that was already occupied did not remove the previous attachment (current behaviour)
...
Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013)
Added regression test for this case.
2013-03-18 20:48:50 +00:00
46a81b3527
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-03-17 23:07:12 +00:00
464201b41d
BulletSim: add INI parameter for angular banking timescale fudge parameter.
2013-03-16 15:34:07 -07:00
fc84ebb819
BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis)
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-16 15:13:40 -07:00
455da9dd20
* Ignores VolumeDetect enabled prim in the camera raycast call. Note: The SceneRaycast call doesn't have a filter option in the interface and physics will use the lower level one for all sorts of goodies so it wouldn't be appropriate to ignore it at the physics layer yet.. though that would be better once the API has filters.
2013-03-16 11:09:49 -04:00
6e1b3f9951
*Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
2013-03-16 03:14:11 -04:00
f081b7e9ef
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
2013-03-16 01:48:04 +01:00
1dcdea6ac4
Fix case where the string member of a LSL_String in a list is null
2013-03-16 01:47:26 +01:00
03075359b5
Finally remove the 'REST' ApplicationPlugins code which has been non-functional and largely commented out for many years.
2013-03-15 23:48:40 +00:00
7e5d553781
Make the LSL memory functions virtual so script engines can override them if they have different memory management.
2013-03-15 23:46:49 +00:00
b9146a7922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-15 23:45:32 +00:00
35843e8ec8
Change the table and field names of XAssetService mysql db tables to be capitalized like Avatars, Friends, etc.
...
Also fixes access time being set on assets rather than XAssetsMeta
This is to try and be somewhat consistent with other service tables that are mainly in this style.
No migration is supplied, since nobody should be using this service yet except on a test basis.
2013-03-15 23:42:16 +00:00
e9f3cd1a60
Implement access time updates on assets for XAssetService.
...
This only happens if access time is older than 30 days currently, in order to reduce database updates.
The idea is to give some idea of assets which haven't been accessed for a very, very long time.
These might conceivably be deleteable, though this will be a risk due to caching at other points in the chain.
This is actually currently much less useable on the xasset service since access time is on metadata rather than the data itself.
And many metadata entries may point to the same data. Probably need to address this.
2013-03-15 23:17:54 +00:00
45dee383db
refactor: Reuse Get() method in AssetService to eliminate some copy/paste in other Get methods
2013-03-15 22:42:34 +00:00
bd0c1d9b6a
Migrate assets from chained asset service to xassetservice as they are requested.
...
This shrinks the asset database over time as duplicate assets are fetched.
2013-03-15 22:33:39 +00:00
d05af4bdad
Fix bug in AssetService where requesting data only for an asset would throw an exception if the asset did not exist.
2013-03-15 22:14:34 +00:00
7fb458b055
minor: log an error rather than info if a connector fails to load.
2013-03-15 22:08:11 +00:00
3a7d9f740e
minor: Make logged message in ServerUtils more consistent.
2013-03-15 22:05:18 +00:00
8cc3adb585
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-15 21:57:25 +00:00
924d6e892a
Make it possible to chain another asset service underneath the de-duplicating XAssetService.
...
This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand.
Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService")
Not yet ready for use.
2013-03-15 21:53:39 +00:00
78b25094dc
BulletSim: Tweak vertical angular attraction to remove double VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-15 14:05:38 -07:00
c10c43d6f6
Fix server statistics always reporting zero for total network bytes in/out.
...
Clean up some parameter code in Statistics.Binary.
2013-03-15 13:59:34 -07:00
d3e76730bd
Add example code to DOExampleModule to pull data from that previously saved by DAExampleModule when instantiating a dynamc object.
2013-03-15 00:49:35 +00:00
cb74186888
Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is necessary to get attributes to save (though this probably happens anyway due to the prim move)
2013-03-15 00:27:06 +00:00
e25ba116a3
refactor: make llGetLinkName() and llGetLinkKey() use a common GetLinkEntity() method
2013-03-15 00:06:42 +00:00
081271e1d7
minor: remove mono compiler warnings in LSL_Api.cs
2013-03-14 23:44:16 +00:00
12900ea84e
Log same environment information to Robust log as is already done for simulator logs, for debug purposes
2013-03-14 23:39:15 +00:00
2fbc08d7dd
refactor: minor cleanup in osGetAvatarList()
2013-03-14 23:19:18 +00:00
0ea0f8aa83
Fix bug in osCauseHealing() if called with an avatar ID for an avatar that is not in the scene.
2013-03-14 23:16:39 +00:00
56b333f301
minor: Use more compact libomv primitive constructors in osNpcGetPos() and osNpcGetRot()
2013-03-14 23:12:58 +00:00
55204ccde6
Fix minor race conditions in OSSL_Api functions where a parcel could be misidentified for moving prims.
2013-03-14 23:09:59 +00:00
f8dab4f93f
refactor: Use LSL_Vector(Vector3) constructor in llCastRay()
2013-03-14 23:06:54 +00:00
ca99f418d8
refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than having to continually take intermediate Vector3s to avoid race conditions
2013-03-14 23:05:21 +00:00
c1115e4c2e
Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject()
...
This conforms to the existing ILandChannel.ParcelsNearPoint() method
2013-03-14 22:56:26 +00:00
c09f4ff483
Fix minor race condition in llGetCameraRot() where inconsistent information could be returned for a rotating camera
2013-03-14 22:49:08 +00:00
114fd042de
Fix minor race condition in llGetCameraPos() where an inconsistent post could be returned for a moving camera
2013-03-14 22:46:27 +00:00
d4b109b4c4
Fix minor race condition in llParcelMediaCommandList() where a parcel could be misidentified for a moving prim
2013-03-14 22:45:00 +00:00
2a81eb8d45
Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, PRIM_SIZE and PRIM_ROT_LOCAL
...
This function is used by all the various ll*Params() and os*Params() functions
2013-03-14 22:42:11 +00:00
b23009e480
Fix minor race condition in llGetGeometricCenter() if this was changing whilst the function was called.
2013-03-14 22:35:41 +00:00
a6f8638174
refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation()
2013-03-14 22:34:48 +00:00
8b657773e4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2013-03-14 22:34:15 +00:00
dd6f1fc637
Fix minor race condition in llGetRootPosition() where inconsistent results could be returned for moving prims
2013-03-14 22:33:44 +00:00
e7603f98b7
Fix minor race conditions in detecting current parcel for llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims
2013-03-14 22:31:07 +00:00
e6eb914675
refactor: use LSL_Vector(Vector3) constructor in llGroundNormal()
2013-03-14 22:29:09 +00:00
f8c24b2a61
minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new one.
2013-03-14 22:26:37 +00:00
3c9bea1e3f
Fix minor race conditions in llTeleportAgent(), llTeleportAgentGlobalCoords(), llEjectFromLand() and llOverMyLand() where the wrong parcel could be identified for very fast moving avatars.
2013-03-14 22:22:10 +00:00
7b85279dba
refactor: Use LSL_Vector(Vector3) constructor in llGetCenterOfMass()
2013-03-14 22:14:32 +00:00
ff6a16b46e
Fix a minor race condition in llInstantMessage() where slightly wrong origin co-ordinates could be given for a fast moving prim
2013-03-14 22:09:05 +00:00
895aa7346f
Fix minor race condition in llGetOmega() where inconsistent results could be returned (accidentally stated that commit 1774c631 was this fix).
...
Commit 1774c631
2013-03-14 22:07:07 +00:00
1774c631cb
Fix minor race condition in llGetOmega() where a call whilst a prim was changing angular velocity could return inconsistent results
2013-03-14 22:04:11 +00:00
04e806036f
refactor: Use LSL_Vector(Vector3) constructor in llGetVel()
2013-03-14 22:02:43 +00:00
ffbbe29229
refactor: Use LSL_Vector(Vector3) constructor in llGetTorque()
2013-03-14 22:01:24 +00:00
c3e081a5ca
Fix minor race condition in llGetLocalRot() where inconsistent results could be returned if the prim was rotating during the call
2013-03-14 22:00:04 +00:00
f840728273
refactor: use cleaner LSL_Rotation quaternion constructor in LSL_Api.GetPartRot()
2013-03-14 21:57:43 +00:00
ad9bd3fe93
Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use the world rotation if the avatar to which they are attached is sitting
2013-03-14 21:46:29 +00:00
e9c394fb4e
Make llGetObjectDetails() return the correct world rotation for a sitting avatar
...
This addresses http://opensimulator.org/mantis/view.php?id=6567
This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation()
SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting.
2013-03-14 21:23:48 +00:00
43220afda2
Improve DAExampleModule to show current necessary locking to avoid race conditions with a serialization thread.
2013-03-13 23:42:14 +00:00
48d41ef307
Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this is being done lazily
2013-03-13 23:25:56 +00:00
39a0928052
minor: Remove some mono compiler warnings in OpenSim.Framework.dll
2013-03-13 23:17:27 +00:00
5c53660a7f
Add prototype dynamic objects map for scene object parts
...
This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes.
This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes.
This commit adds a DOExampleModule to demonstrate/evolve this code.
Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap.
DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later.
These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
2013-03-13 22:59:06 +00:00
0e426c5cd0
Merge branch 'avination' into careminster
2013-03-13 02:03:46 +00:00
710381e838
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
2013-03-13 02:02:46 +00:00
b7216f4daf
minor: save some commented out log lines which will be useful again in future debugging of VectorRenderModule
2013-03-13 00:46:17 +00:00
f8a4d95bdd
minor: Remove mono compiler warning in LLClientView
2013-03-13 00:22:07 +00:00
0d25be3f81
Make C# scripts return correct error line and column numbers instead of failing because they have no linemap.
...
Adapted fix from http://opensimulator.org/mantis/view.php?id=6571
Thanks Nickel Briand
2013-03-13 00:19:37 +00:00
fb1211ad5e
Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section of OpenSim.ini. False by default.
...
This option allows the simulator to specify that the cancel button on inter-region teleports should never appear.
This exists because sometimes cancellation will result in a stuck avatar requiring relog.
It may be hard to prevent this due to the protocol design (the LL grid has the same issue)
In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
2013-03-12 23:01:27 +00:00
c43d4b5572
Improve teleport cancellation in some circumstances, though cancelling teleports is still not recommended.
...
Previously, hitting the cancel button on a teleport would cancel on the client side but the request was ignored on the server side.
Cancel would still work if the teleport failed in the early stages (e.g. because the destination never replied to early CreateAgent and UpdateAgent messages).
But if the teleport still completed after a delay here or later on, the viewer would become confused (usual symptom appears to be avatar being unable to move/reteleport).
This commit makes OpenSimulator obey cancellations which are received before it sends the TeleportFinish event queue message and does proper cleanup.
But cancellations received after this (which can happen even though the cancel button is removed as this messages comes on a different thread) can still result in a frozen avatar.
This looks extremely difficult and impossible to fix.
I can replicate the same problem on the Linden Lab grid by hitting cancel immediately after a teleport starts (a teleport which would otherwise quickly succeed).
2013-03-12 22:16:09 +00:00
5b37063178
Spot fix the interpenetration issue. Thanks, Ter.
2013-03-12 03:47:27 +01:00
0c6268fe56
minor: remove mono compiler warning in SceneObjectUndoRedoTests
2013-03-11 23:15:13 +00:00
be686f80a3
minor: Remove mono compiler warnings from LSL_ApiHttpTests
2013-03-11 23:01:07 +00:00
e898a5fec5
minor: Remove mono compiler warnings in EventQueueTests
2013-03-11 22:42:27 +00:00
1e7c7fb779
Merge branch 'master' into careminster
2013-03-11 19:09:49 +00:00
1120bcf123
BulletSim: remove the ability for avatars to fly off the edge of
...
regions when there are no region neighbors.
Add some terrain location processing routines to support above.
2013-03-09 14:15:14 -08:00
5097437e11
* Apparently, sometimes texture entries come in from the wire with no default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception.
2013-03-08 19:32:47 -05:00
70f0587558
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-08 01:07:05 +00:00
33dab49d22
* Just another one of those new packet blocks causing a null ref. Defaulting to zero length array.....
2013-03-07 19:19:36 -05:00
6706e189d5
minor: remove some completely unused string local vars added recently in commit 984faf2
2013-03-06 23:11:32 +00:00
2fe938d11d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-06 23:07:04 +00:00
5751ecde52
Add code for testing event queue messages recevied on region cross.
...
This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
2013-03-06 23:06:00 +00:00
f954c53ddb
* Separate two if trees that got merged into one if tree with borked logic.
2013-03-06 17:02:53 -05:00
8960418e7d
Add regression test for presence crossing between regions on the same simulator.
...
Unlike a much earlier commented out version of this test, this is done in synchronous mode.
2013-03-06 21:37:53 +00:00
9875e840f7
Per discussions with justincc... split the JsonStore type
...
functions into one for node type and one for value type.
Define and export constants for both nodes and values.
2013-03-05 20:33:17 -08:00
30e06b0742
Convert doubles passed back through the MOD interface into LSL_Floats
2013-03-05 20:32:06 -08:00
a9f380d124
Fix bug in osGetPrimitiveParams() so that it works for prims with the same owner as the script and not ones with different owners.
...
Addresses http://opensimulator.org/mantis/view.php?id=6560
2013-03-06 00:22:58 +00:00
Diva Canto