aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Fix for hanging on "Connecting to region".. caused by packets being p...Melanie2010-11-052-8/+0
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-9/+6
|\
| * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-284-13/+7
| |\
| * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-9/+6
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-295-13/+12
|\ \ \
| * \ \ Merge branch 'dev-appearance'Melanie2010-10-293-11/+11
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-213-11/+11
| | |\ \ | | | |/
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-203-11/+11
| * | | Formatting cleanup.Jeff Ames2010-10-282-2/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-272-9/+6
|\ \ \ \ | |/ / /
| * | | Formatting cleanup.Jeff Ames2010-10-272-9/+6
| |/ /
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-2/+0
|\ \ \ | |/ /
| * | Remove a bit of dead code relating to ObjectCapacityMelanie2010-10-211-2/+0
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-213-14/+18
|\ \ | |/
| * Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC grou...Justin Clark-Casey (justincc)2010-10-192-3/+6
| * Display more information when xmlrpcgroupsserver comms failsJustin Clark-Casey (justincc)2010-10-192-13/+14
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-085-7/+8
* | 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
| * Convert worldview to GETMelanie2010-10-061-7/+11
* | Convert worldview to GETMelanie2010-10-061-7/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-063-0/+263
|\ \ | |/
| * 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-062-0/+81
* | 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 w...Melanie2010-10-021-0/+24
| * Reapplying the parts of the prior revert that were not derived from theMelanie2010-10-021-2/+2
| * Revert "Forward-port 0.6 fix"Melanie2010-10-021-2/+2
* | 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-211-9/+2
|\ \ | |/
| * For all Flotasm group module XMLRPC calls, correct parameter requestingAgentI...Justin Clark-Casey (justincc)2010-09-171-9/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-176-159/+124
|\ \ | |/
| * Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-166-159/+124
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-161-1/+1
|\ \ | |/
| * rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co...Justin Clark-Casey (justincc)2010-09-151-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1312-42/+38
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-126-28/+25
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-106-14/+13
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-072-2/+2
|\ \ | |/
| * Make console backup command do a forced backup rather than non-forcedJustin Clark-Casey (justincc)2010-09-062-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-10/+12
|\ \ | |/
| * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-281-10/+12
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-266-123/+170
|\ \ | |/
| * Improve consistency of locking for SOG.m_parts in order to avoid race conditi...Justin Clark-Casey (justincc)2010-08-266-123/+170