Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵ | Melanie | 2010-11-22 | 1 | -0/+1 | |
| | | | | | | | | why standalone should not. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-21 | 3 | -615/+112 | |
|\ \ | |/ | ||||||
| * | Finish the standalone mode freeswitch work and add config examples | Melanie | 2010-11-21 | 1 | -43/+47 | |
| | | ||||||
| * | Convert the Freeswitch module to new style | Melanie | 2010-11-21 | 1 | -93/+98 | |
| | | ||||||
| * | Strip the dialplan and directory methods from the region module | Melanie | 2010-11-21 | 3 | -522/+10 | |
| | | ||||||
* | | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵ | Melanie | 2010-11-05 | 2 | -8/+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-refactor | Melanie | 2010-10-29 | 1 | -9/+6 | |
|\ \ | |/ | ||||||
| * | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 4 | -13/+7 | |
| |\ | ||||||
| * | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -9/+6 | |
| | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly. | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 5 | -13/+12 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 3 | -11/+11 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 3 | -11/+11 | |
| | |\ \ | | | |/ | | | | | | | | | dev-appearance | |||||
| | | * | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 3 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | Formatting cleanup. | Jeff Ames | 2010-10-28 | 2 | -2/+1 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 2 | -9/+6 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 2 | -9/+6 | |
| |/ / | ||||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -2/+0 | |
|\ \ \ | |/ / | ||||||
| * | | Remove a bit of dead code relating to ObjectCapacity | Melanie | 2010-10-21 | 1 | -2/+0 | |
| |/ | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 3 | -14/+18 | |
|\ \ | |/ | ||||||
| * | Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC ↵ | Justin Clark-Casey (justincc) | 2010-10-19 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | groups module This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members Not sure why this wasn't being done before... | |||||
| * | Display more information when xmlrpcgroupsserver comms fails | Justin Clark-Casey (justincc) | 2010-10-19 | 2 | -13/+14 | |
| | | | | | | | | Improve debugging messages | |||||
* | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 5 | -7/+8 | |
| | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 2 | -3/+7 | |
|\ \ | |/ | ||||||
| * | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 2 | -3/+7 | |
| | | | | | | | | functional | |||||
| * | Convert worldview to GET | Melanie | 2010-10-06 | 1 | -7/+11 | |
| | | ||||||
* | | Convert worldview to GET | Melanie | 2010-10-06 | 1 | -7/+11 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 3 | -0/+263 | |
|\ \ | |/ | ||||||
| * | Change the URL /worldview to /worldview/<region id> to support multiregion | Melanie | 2010-10-06 | 2 | -3/+4 | |
| | | ||||||
| * | Convert the BMP to a JPEG image and return it. This should be testable. | Melanie | 2010-10-06 | 1 | -1/+7 | |
| | | ||||||
| * | Add the parameter plumbing and image generation | Melanie | 2010-10-06 | 2 | -2/+22 | |
| | | ||||||
| * | Add WOrldView request handler and plumbing | Melanie | 2010-10-06 | 2 | -0/+155 | |
| | | ||||||
| * | Add WorldView module skeleton | Melanie | 2010-10-06 | 2 | -0/+81 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -0/+24 | |
|\ \ | |/ | ||||||
| * | So, the client can have an old idea of the object properties for the object ↵ | Melanie | 2010-10-02 | 1 | -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 the | Melanie | 2010-10-02 | 1 | -2/+2 | |
| | | | | | | | | original patch | |||||
| * | Revert "Forward-port 0.6 fix" | Melanie | 2010-10-02 | 1 | -2/+2 | |
| | | | | | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -2/+2 | |
|\ \ | |/ | ||||||
| * | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 1 | -9/+2 | |
|\ \ | |/ | ||||||
| * | For all Flotasm group module XMLRPC calls, correct parameter ↵ | Justin Clark-Casey (justincc) | 2010-09-17 | 1 | -9/+2 | |
| | | | | | | | | | | | | requestingAgentID to RequestingAgentID This was stopping the get group member roles call from working, and may have affected other things | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 6 | -159/+124 | |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | |||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 6 | -159/+124 | |
| | | | | | | | | MapAndArray collection | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-16 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -1/+1 | |
| | | | | | | | | code readability | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 12 | -42/+38 | |
|\ \ | |/ | | | | | | | 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 Ames | 2010-09-12 | 6 | -28/+25 | |
| | | ||||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 6 | -14/+13 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 2 | -2/+2 | |
|\ \ | |/ |