Commit Graph

15215 Commits (24a997eb7ccb59f2c7bbc52cd1ddb9a7801e6aac)

Author SHA1 Message Date
Melanie 24a997eb7c Add MessageKey to section Messaging, a key that prevents injection of
IM from external sources
2010-12-30 20:57:56 +01:00
Melanie 98769ed040 Merge branch 'master' into careminster-presence-refactor 2010-12-30 02:31:43 +00:00
Melanie 1f4d0ad460 Fix up a prior fix (refix the fixed fix :) 2010-12-30 02:31:05 +00:00
Melanie 3b50066ceb Merge branch 'master' into careminster-presence-refactor 2010-12-30 01:40:38 +00:00
Melanie a32f80b9e3 Implement SendPlacesReply 2010-12-30 01:36:09 +00:00
Melanie 2cb2bff9b2 Implement SendPlacesReply 2010-12-30 00:31:59 +01:00
Melanie dbaaccf92a Copying a ref type under lock doesn't dissociate it from the source.
Use a new list to do that.
2010-12-29 21:02:45 +01:00
Kitto Flora 88db69e017 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-12-29 21:18:28 +00:00
Kitto Flora 64209c9be1 Fix av/prim eject problem. 2010-12-29 21:13:49 +00:00
Diva Canto d42e0c39fc Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified. 2010-12-29 07:36:39 -08:00
Melanie dfc0c8dca6 Remove the restriction on communication across scopes. This will allow
cross-scope users to IM each other.
2010-12-29 15:13:10 +01:00
Myan Thor 915c0b17b0 fixes a problem with ending slashes in GatekeeperService to verify session-addresses 2010-12-29 06:03:43 -08:00
Mic Bowman 94ed69b1da Update SimianGridServicesConnector to work more like
a connector so we can take advantage of the logic in
RemoteGridServicesConnector.
2010-12-27 17:18:49 -08:00
Diva Canto 6386dfd362 No need for these methods to be virtual now. 2010-12-27 16:26:29 -08:00
Diva Canto f801d50a8a WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
Mic Bowman b16173e3e8 Drop the static from default wearables. It isn't
static.
2010-12-27 12:43:54 -08:00
Kitto Flora 61b7ec5fb5 Fixing AbsolutePosition to correct llSensor in vehicles 2010-12-26 22:52:03 +00:00
Melanie f2dd324bc8 Fix linking link sets to rotated prims. 2010-12-26 20:42:47 +01:00
Melanie 8186bf2525 Remove some code that was meant to fool the viewer into thinking SLT. It never
worked and it turned out the issues were really in the backend.
2010-12-26 07:29:23 +01:00
Diva Canto 06077f775f Fixes mantis #5279 2010-12-25 08:28:42 -08:00
Melanie b17150c3e8 Fix the corner casse of stack overflow when logging out with attachments 2010-12-25 08:05:42 +01:00
Melanie 0aeafc9919 Fix the recent stack overflow 2010-12-25 07:25:56 +01:00
Diva Canto b23b29a53e This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look. 2010-12-24 16:23:00 -08:00
Melanie 75010e5e1c Merge branch 'master' into careminster-presence-refactor 2010-12-25 00:04:46 +00:00
Melanie b16f4024db Update child prim group positions in moving vehicles 2010-12-24 21:04:10 +01:00
Diva Canto 3eaaaa0d99 One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's. 2010-12-24 08:50:00 -08:00
Diva Canto 135b012bbd Hopefully this fixes all prim inventory issues. No more abort, no more keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added.
This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
2010-12-23 19:31:37 -08:00
Melanie 42d44c00f3 Change the mute list parts of the client interface so that all data is provided
to the module
2010-12-24 03:46:57 +01:00
Melanie 2e3d0fb276 Merge branch 'master' into careminster-presence-refactor 2010-12-24 02:23:26 +00:00
Teravus Ovares (Dan Olivares) d829580e5e Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-12-23 13:17:55 -05:00
Teravus Ovares (Dan Olivares) c108968020 * Cleanup from a commit a while ago. 2010-12-23 13:17:33 -05:00
Diva Canto bc67bc0d94 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-23 10:05:45 -08:00
Diva Canto 54418c5e69 Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space. 2010-12-23 10:05:08 -08:00
Melanie 70bb542727 Merge branch 'master' into careminster-presence-refactor 2010-12-23 17:20:45 +00:00
Melanie 2cc07de0ba Merge branch 'master' into careminster-presence-refactor 2010-12-23 12:08:38 +00:00
Melanie 26e601a776 Put back a commented section of code. With some viewers, object inventory
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
Melanie efa8bd8eb3 Revert "reactivating some traces to track a dead thread"
This reverts commit d7df871f9f.

Useless spam nit suitable for debugging anything that is currently brokwn
2010-12-23 11:15:43 +00:00
Teravus Ovares (Dan Olivares) 46db73b62b * Re-Adding Scene TimeDilation to Object Update Packets.
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created.  The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire.  Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
sacha 98f0b4c72a Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-12-23 08:14:43 +00:00
sacha d7df871f9f reactivating some traces to track a dead thread
seen @ NT and Otaku
2010-12-23 08:11:52 +00:00
Melanie d06456c8b2 Merge branch 'master' into careminster-presence-refactor 2010-12-23 02:57:45 +00:00
Diva Canto 862da9a55f Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer. 2010-12-22 17:55:58 -08:00
Melanie f29675bf87 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-12-22 17:35:12 +00:00
Diva Canto 2d8f448322 Fixed wrong argument cardinality in debug message. 2010-12-22 10:42:29 -08:00
Melanie 990e73d7cb Fix a broken format on an error message. Also replace yet another e.Message
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
Melanie 32cc569b00 Fix up some locking issues in task inventory. Don't use any prior versions in production! 2010-12-22 13:45:21 +01:00
Melanie cf37b3b943 Prevent a null ref when an avatar login doesn't go as planned 2010-12-22 03:25:30 +01:00
Teravus Ovares (Dan Olivares) 25ecd62b1f * Adds AbortXfer to the ClientAPI mix
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one.   This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking...    Using NewFiles to lock the rest of them.   We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail.  The client will not do that on it's own.
2010-12-21 19:15:44 -05:00
Melanie e9382c2939 Merge branch 'master' into careminster-presence-refactor 2010-12-21 23:09:12 +00:00
Melanie 303c02133f Merge branch 'master' into careminster-presence-refactor 2010-12-21 23:00:01 +00:00