aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-1/+1
|\ \ | |/
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-061-1/+1
| | | | | | | | functional
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-064-4/+6
|\ \ | |/
| * Add the view generating method to the image generator interfaceMelanie2010-10-051-0/+2
| |
| * Formatting cleanup.Jeff Ames2010-10-043-4/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-2/+1
|\ \ | |/
| * I really have to say it again and again: e.Message is NOT enough data forMelanie2010-10-031-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-refactorMelanie2010-10-031-2/+2
|\ \ | |/
| * Initial port of the Warp3D map tile rendererMelanie2010-10-031-2/+2
| |
| * 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.
* | Enforce region agent limit as set in estate toolsMelanie2010-09-302-0/+13
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-301-2/+2
|\ \ | |/
| * Forward-port 0.6 fixMelanie2010-09-301-2/+2
| |
| * Fix an inventory fetch issueMelanie2010-09-301-0/+3
| |
* | Fix an inventory fetch issueMelanie2010-09-301-0/+3
| |
* | Fix a potential key collisionMelanie2010-09-301-1/+1
| |
* | Lock the iteration over the inventory items when saving script statesMelanie2010-09-281-0/+2
| |
* | Try to prevent threading issues in SP.SetAppearance by locking itMelanie2010-09-271-40/+45
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-47/+48
|\ \ | |/
| * Prevent setting arbitrary groups on your objects.Melanie2010-09-271-0/+3
| |
| * Fix build breakMelanie2010-09-271-37/+38
| |
| * if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-271-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 belongingMelanie2010-09-271-0/+6
| | | | | | | | to the connected client.
* | Prevent setting arbitrary groups on your objects.Melanie2010-09-271-0/+3
| |
* | Restrict inventory items added in a transaction to folder belongingMelanie2010-09-271-0/+6
| | | | | | | | to the connected client.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-253-3/+10
|\ \ | |/
| * Add UUID to physics prim name parameter so that diagnostic messages can be ↵Justin Clark-Casey (justincc)2010-09-252-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/opensimJustin Clark-Casey (justincc)2010-09-251-10/+0
| |\
| * | If the uuid gatherer fails to find the asset containing gesture metadata, ↵Justin Clark-Casey (justincc)2010-09-241-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.Melanie2010-09-241-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 ↵Melanie2010-09-211-1/+1
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Refactor script create permission into the perms moduleMelanie2010-09-211-10/+0
| | | |
| * | | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-1/+1
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-213-12/+41
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-212-2/+41
| |\ \ | | |/
| | * If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ↵Justin Clark-Casey (justincc)2010-09-212-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 moduleMelanie2010-09-211-10/+0
| |/
* | Remove the now unused partslockroot2010-09-171-1/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1712-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 Hurliman2010-09-161-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-163-1/+38
| |\
| | * Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}Justin Clark-Casey (justincc)2010-09-171-22/+21
| | |
| | * Removing debugroot2010-09-161-1/+0
| | |
| | * JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-164-1/+40
| | |
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-1612-943/+682
| |/ | | | | | | MapAndArray collection
* | Removing debugroot2010-09-161-1/+0
| |
* | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-164-1/+40
| |
* | Some small bug fixesroot2010-09-162-1/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-163-13/+10
|\ \ | |/