aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add needed dummy to sample moneyMelanie2011-02-171-0/+4
|
* Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+3
|\
| * Honor check of m_Enabled in WorldViewModule.Diva Canto2011-02-051-0/+3
| |
| * Implement SendPlacesReplyMelanie2010-12-301-0/+4
| |
* | Implement SendPlacesReplyMelanie2010-12-301-0/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+4
|\ \ | |/
| * * Adds AbortXfer to the ClientAPI mixTeravus Ovares (Dan Olivares)2010-12-211-0/+4
| | | | | | | | | | | | * 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.
| * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-281-2/+0
| |\
* | | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵Melanie2010-11-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-292-9/+9
|\ \ \
| * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-212-9/+9
| |\ \ \ | | |/ / | | | / | | |/ | |/| dev-appearance
| | * Major refactoring of appearance handling.Master ScienceSim2010-10-202-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-2/+0
|\ \ \ | |/ /
| * | Remove a bit of dead code relating to ObjectCapacityMelanie2010-10-211-2/+0
| |/
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-082-3/+3
| | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-062-3/+7
|\ \ | |/
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-062-3/+7
| | | | | | | | functional
| * Convert worldview to GETMelanie2010-10-061-7/+11
| |
* | Convert worldview to GETMelanie2010-10-061-7/+11
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-062-0/+262
|\ \ | |/
| * Change the URL /worldview to /worldview/<region id> to support multiregionMelanie2010-10-062-3/+4
| |
| * Convert the BMP to a JPEG image and return it. This should be testable.Melanie2010-10-061-1/+7
| |
| * Add the parameter plumbing and image generationMelanie2010-10-062-2/+22
| |
| * Add WOrldView request handler and plumbingMelanie2010-10-062-0/+155
| |
| * Add WorldView module skeletonMelanie2010-10-061-0/+80
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-1/+1
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-041-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-0/+24
|\ \ | |/
| * So, the client can have an old idea of the object properties for the object ↵Melanie2010-10-021-0/+24
| | | | | | | | 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.
| * Reapplying the parts of the prior revert that were not derived from theMelanie2010-10-021-2/+2
| | | | | | | | original patch
| * Revert "Forward-port 0.6 fix"Melanie2010-10-021-2/+2
| | | | | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-301-2/+2
|\ \ | |/
| * Forward-port 0.6 fixMelanie2010-09-301-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-132-3/+2
|\ \ | |/ | | | | | | 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.
| * Formatting cleanup.Jeff Ames2010-09-121-1/+1
| |
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-101-2/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-182-11/+12
|\ \ | |/
| * Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files ↵Diva Canto2010-08-161-0/+4
| | | | | | | | affected.
| * Work on TeleportStart: renamed method from TeleportLocationStart to ↵Diva Canto2010-08-161-1/+1
| | | | | | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
| * refactor: move Scene.PerformObjectBuy into BuySellModuleJustin Clark-Casey (justincc)2010-08-131-9/+6
| |
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-131-1/+1
| |
| * Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie2010-07-141-4/+0
| | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
| * Remove getting the object capacity from the money module. It is now setMelanie Thielker2010-07-141-4/+3
| | | | | | | | directly from the Region Info (and the region ini file)
| * Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-021-16/+15
| |
| * Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-021-21/+0
| |
* | Implement CreateNewOutfitAttachments. This addresses mantis #199.Tom2010-08-061-1/+1
| |
* | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie Thielker2010-07-141-4/+0
| | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
* | Remove getting the object capacity from the money module. It is now setMelanie Thielker2010-07-141-4/+3
| | | | | | | | directly from the Region Info (and the region ini file)
* | Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-021-16/+15
| |
* | Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-021-21/+0
| |