Commit Graph

151 Commits

Author SHA1 Message Date
Melanie
d1913f2429 Merge branch 'master' into careminster-presence-refactor 2011-04-18 20:17:29 +01:00
Melanie
ec0aa7a90b Fix up client implementations 2011-04-17 23:17:05 +02:00
Mic Bowman
69d014e1dc First pass at moving object property requests into a queue similar
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.

This is experimental code.
2011-04-12 15:58:57 -07:00
Melanie
329fa73695 Merge branch 'master' into careminster-presence-refactor 2011-04-01 07:44:43 +01:00
Justin Clark-Casey (justincc)
6ae04448f7 Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
2011-03-25 23:05:51 +00:00
Melanie
c79f79fc84 Add needed dummy to sample money 2011-02-17 18:51:43 +01:00
Melanie
076f2ac8db Merge branch 'master' into careminster-presence-refactor 2011-02-07 23:07:36 +00:00
Diva Canto
3411d4867d Honor check of m_Enabled in WorldViewModule. 2011-02-05 19:40:55 -08: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
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
f985775962 Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready."
This reverts commit 91b1d17e5b.

Conflicts:

	OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-11-05 14:27:14 +01:00
Melanie
9331898c32 Merge branch 'master' into careminster-presence-refactor 2010-10-29 20:40:48 +01:00
Master ScienceSim
f2c1d0e34f Merge branch 'opensim-master' into dev-appearance 2010-10-28 09:09:42 -07:00
Melanie
28c4dd7931 Merge branch 'master' into careminster-presence-refactor 2010-10-21 20:26:29 +01:00
Melanie
08e14d653e Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance 2010-10-21 17:09:42 +01:00
Melanie
338e7481f9 Remove a bit of dead code relating to ObjectCapacity 2010-10-21 13:21:46 +01:00
Master ScienceSim
b1c8d05888 Major refactoring of appearance handling.
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.

AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.

AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.

AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
Melanie
52dd547863 Make SendKillObject send multiple localIDs in one packet. This avoids the
halting visual behavior of large group deletes and eliminates the packet flood
2010-10-08 11:31:52 +02:00
Melanie
ca50f6a82c Merge branch 'master' into careminster-presence-refactor 2010-10-06 05:45:29 +01:00
Melanie
d45276b3f6 Add and plumb the usetex URL parameter to worldview. Required but not yet
functional
2010-10-06 05:44:19 +01:00
Melanie
9a1c8db443 Convert worldview to GET 2010-10-06 05:17:31 +01:00
Melanie
1a47ec082e Convert worldview to GET 2010-10-06 05:15:47 +02:00
Melanie
b7586806cd Merge branch 'master' into careminster-presence-refactor 2010-10-06 03:52:57 +01:00
Melanie
623f57deb5 Change the URL /worldview to /worldview/<region id> to support multiregion 2010-10-06 03:51:55 +01:00
Melanie
752b6a8764 Convert the BMP to a JPEG image and return it. This should be testable. 2010-10-06 03:40:55 +01:00
Melanie
abfcd168fc Add the parameter plumbing and image generation 2010-10-06 03:32:01 +01:00
Melanie
17316170a5 Add WOrldView request handler and plumbing 2010-10-06 03:03:10 +01:00
Melanie
ce89f08f6b Add WorldView module skeleton 2010-10-06 02:06:50 +01:00
Melanie
d8149373c1 Merge branch 'master' into careminster-presence-refactor 2010-10-06 00:27:10 +01:00
Jeff Ames
bc9f793a92 Formatting cleanup. 2010-10-04 21:28:17 -04:00
Melanie
662976b602 Merge branch 'master' into careminster-presence-refactor 2010-10-02 20:12:36 +01:00
Melanie
6fc1ceb2ee So, the client can have an old idea of the object properties for the object when it goes to buy. This can cause a problem in the buy process. Additionally Hazim mentioned that the buy packets are spoofable. The core modules are the crowing glory example of best practice :P, so therefore, setting the example here, Validate Client sent Buy Data. WebAppSecurity 101, Never trust a client. Validate Validate Validate! Or you'll have problems whether intentional or not. 2010-10-02 20:11:43 +01:00
Melanie
87c6386884 Reapplying the parts of the prior revert that were not derived from the
original patch
2010-10-02 18:47:26 +01:00
Melanie
b01020b84a Revert "Forward-port 0.6 fix"
This reverts commit 90b51dc7d6.
2010-10-02 18:45:48 +01:00
Melanie
521e2c8355 Merge branch 'master' into careminster-presence-refactor 2010-09-30 16:01:45 +01:00
Melanie
90b51dc7d6 Forward-port 0.6 fix 2010-09-30 15:52:33 +01:00
Melanie
6a1ce17cdb Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
John Hurliman
dd277a0d02 First pass at cleaning up thread safety in EntityManager and SceneGraph 2010-09-10 12:04:12 -07:00
Melanie
e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Diva Canto
a8b80ef800 Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected. 2010-08-16 11:39:46 -07:00
Diva Canto
77de28965a Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule). 2010-08-16 11:33:59 -07:00
Justin Clark-Casey (justincc)
e89f0b3f71 refactor: move Scene.PerformObjectBuy into BuySellModule 2010-08-13 22:29:42 +01:00
Justin Clark-Casey (justincc)
b51534852f minor: remove mono compiler warning 2010-08-13 21:07:45 +01:00
Tom
330343505c Implement CreateNewOutfitAttachments. This addresses mantis #199. 2010-08-06 11:39:10 -07:00
Melanie
e1ea82b329 Major attachments cleanup. Remove unused AttachObject ClientView method
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:51:12 +01:00
Melanie Thielker
bebbe407ee Major attachments cleanup. Remove unused AttachObject ClientView method
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:58:23 +02:00
Melanie Thielker
cd8bb316ea Remove getting the object capacity from the money module. It is now set
directly from the Region Info (and the region ini file)
2010-07-14 03:51:00 +01:00