Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 1 | -1/+1 | |
| | | | | | | | | functional | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 4 | -4/+6 | |
|\ \ | |/ | ||||||
| * | Add the view generating method to the image generator interface | Melanie | 2010-10-05 | 1 | -0/+2 | |
| | | ||||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 3 | -4/+4 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -2/+1 | |
|\ \ | |/ | ||||||
| * | I really have to say it again and again: e.Message is NOT enough data for | Melanie | 2010-10-03 | 1 | -2/+1 | |
| | | | | | | | | | | | | troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must be used. Fix one more instance of that cr.p | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -2/+2 | |
|\ \ | |/ | ||||||
| * | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 1 | -2/+2 | |
| | | ||||||
| * | 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. | |||||
* | | Enforce region agent limit as set in estate tools | Melanie | 2010-09-30 | 2 | -0/+13 | |
| | | ||||||
* | | 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 | |
| | | ||||||
| * | Fix an inventory fetch issue | Melanie | 2010-09-30 | 1 | -0/+3 | |
| | | ||||||
* | | Fix an inventory fetch issue | Melanie | 2010-09-30 | 1 | -0/+3 | |
| | | ||||||
* | | Fix a potential key collision | Melanie | 2010-09-30 | 1 | -1/+1 | |
| | | ||||||
* | | Lock the iteration over the inventory items when saving script states | Melanie | 2010-09-28 | 1 | -0/+2 | |
| | | ||||||
* | | Try to prevent threading issues in SP.SetAppearance by locking it | Melanie | 2010-09-27 | 1 | -40/+45 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -47/+48 | |
|\ \ | |/ | ||||||
| * | Prevent setting arbitrary groups on your objects. | Melanie | 2010-09-27 | 1 | -0/+3 | |
| | | ||||||
| * | Fix build break | Melanie | 2010-09-27 | 1 | -37/+38 | |
| | | ||||||
| * | if you can't edit a prim's inventory, you don't need to see the asset ids. | Melanie | 2010-09-27 | 1 | -3/+11 | |
| | | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors. | |||||
| * | Restrict inventory items added in a transaction to folder belonging | Melanie | 2010-09-27 | 1 | -0/+6 | |
| | | | | | | | | to the connected client. | |||||
* | | Prevent setting arbitrary groups on your objects. | Melanie | 2010-09-27 | 1 | -0/+3 | |
| | | ||||||
* | | Restrict inventory items added in a transaction to folder belonging | Melanie | 2010-09-27 | 1 | -0/+6 | |
| | | | | | | | | to the connected client. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 3 | -3/+10 | |
|\ \ | |/ | ||||||
| * | Add UUID to physics prim name parameter so that diagnostic messages can be ↵ | Justin Clark-Casey (justincc) | 2010-09-25 | 2 | -3/+3 | |
| | | | | | | | | | | | | made more useful. If a separate UUID parameter is better for the future then this can be added later on. | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-25 | 1 | -10/+0 | |
| |\ | ||||||
| * | | If the uuid gatherer fails to find the asset containing gesture metadata, ↵ | Justin Clark-Casey (justincc) | 2010-09-24 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | then simply return rather than generating an exception This matches existing behaviour, though better diagnostics for missing assets may be good later on. This addresses http://opensimulator.org/mantis/view.php?id=4977 | |||||
* | | | if you can't edit a prim's inventory, you don't need to see the asset ids. | Melanie | 2010-09-24 | 1 | -1/+8 | |
| | | | | | | | | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors. | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-09-21 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * | | | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -10/+0 | |
| | | | | ||||||
| * | | | Fix a merge artefact that broke script state persistence in XAttachments | Melanie | 2010-09-19 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 3 | -12/+41 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | ||||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-21 | 2 | -2/+41 | |
| |\ \ | | |/ | ||||||
| | * | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ↵ | Justin Clark-Casey (justincc) | 2010-09-21 | 2 | -2/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | scene, remove the old uuid reference from m_parts as well as adding the new one. The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene) Added unit test for this behaviour. Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error. | |||||
| * | | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -10/+0 | |
| |/ | ||||||
* | | Remove the now unused partslock | root | 2010-09-17 | 1 | -1/+0 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 12 | -1027/+653 | |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | |||||
| * | Fixed a regression in SOG.Copy() | John Hurliman | 2010-09-16 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-16 | 3 | -1/+38 | |
| |\ | ||||||
| | * | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} | Justin Clark-Casey (justincc) | 2010-09-17 | 1 | -22/+21 | |
| | | | ||||||
| | * | Removing debug | root | 2010-09-16 | 1 | -1/+0 | |
| | | | ||||||
| | * | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 4 | -1/+40 | |
| | | | ||||||
| * | | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 12 | -943/+682 | |
| |/ | | | | | | | MapAndArray collection | |||||
* | | Removing debug | root | 2010-09-16 | 1 | -1/+0 | |
| | | ||||||
* | | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 4 | -1/+40 | |
| | | ||||||
* | | Some small bug fixes | root | 2010-09-16 | 2 | -1/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-16 | 3 | -13/+10 | |
|\ \ | |/ |