Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-26 | 4 | -9/+11 |
|\ | |||||
| * | When receiving intersim IM, don't let the spoof protection bomb | Melanie | 2010-09-26 | 1 | -1/+2 |
| | | |||||
| * | Consistency patch: use Path.Combine() instead of + and eliminate the need | Melanie | 2010-09-26 | 3 | -8/+9 |
| | | | | | | | | for a trailing slash on exports/ | ||||
| * | Typo fixes | Melanie | 2010-09-26 | 2 | -7/+7 |
| | | |||||
| * | adding configurable j2kDecodeCache path | BlueWall | 2010-09-26 | 4 | -8/+18 |
| | | | | | | | | | | | | | | | | allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache | ||||
| * | Add configurable path to script engine assemblies | BlueWall | 2010-09-26 | 4 | -15/+25 |
| | | | | | | | | | | | | | | | | | | Adding ability to place script engine assemblies outside the codebase directories. Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies" Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Typo fixes | Melanie | 2010-09-26 | 2 | -7/+7 |
| | | |||||
* | | Merge Master | Melanie | 2010-09-26 | 8 | -20/+40 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Prevent spoofing the agent name on text IM | Melanie | 2010-09-25 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 6 | -142/+157 |
|\ \ | |/ | |||||
| * | Fix a minor economy issue | Melanie | 2010-09-25 | 1 | -1/+4 |
| | | |||||
| * | Add prim name to OdePrim Error and Warning messages. | Justin Clark-Casey (justincc) | 2010-09-25 | 1 | -42/+45 |
| | | | | | | | | This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over. | ||||
| * | 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 | 3 | -116/+128 |
| |\ | |||||
| | * | Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() ↵ | Kevin Cozens | 2010-09-24 | 1 | -100/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions per the LSL wiki. Signed-off-by: Melanie <melanie@t-data.com> This patch also fixes a large amount of trailing whitespace. While this is beneficial, it should really be in a separate patch that fixes whitespace only. Just good practice. | ||||
| * | | 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 | ||||
* | | | Experimental locking of taint processing | Melanie | 2010-09-25 | 1 | -76/+80 |
| | | | |||||
* | | | 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 | ||||
| * | | | Fix a typo | Melanie | 2010-09-21 | 1 | -3/+3 |
| | | | | |||||
| * | | | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 2 | -15/+23 |
| | | | | |||||
| * | | | 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 | 7 | -31/+69 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-21 | 5 | -15/+45 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-21 | 7 | -129/+137 |
| | |\ | |||||
| | | * | Clarify help text for use of file paths with console command "create region". | Marck | 2010-09-18 | 1 | -1/+1 |
| | | | | |||||
| | | * | Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars | ||||
| | | * | 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 | ||||
| | * | | 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. | ||||
| * | | | Fix a typo | Melanie | 2010-09-21 | 1 | -3/+3 |
| | | | | |||||
| * | | | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 2 | -15/+23 |
| | |/ | |/| | |||||
* | | | Overwrite the core version of the string parsing method with ours | Melanie | 2010-09-17 | 1 | -60/+37 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -37/+60 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-17 | 4 | -35/+111 |
| |\ \ | |||||
| * | | | Applying the llParseString2List() patch from #5036 that Melanie claims was ↵ | John Hurliman | 2010-09-17 | 1 | -81/+22 |
| | |/ | |/| | | | | | | | already applied | ||||
* | | | Remove the now unused partslock | root | 2010-09-17 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -0/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | Send kill packets for avatars, too | Melanie | 2010-09-17 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 28 | -1259/+830 |
|\ \ \ | |/ / | | | | | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 3 | -35/+107 |
| |/ | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
| * | 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 | 6 | -3/+55 |
| |\ | |||||
| | * | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} | Justin Clark-Casey (justincc) | 2010-09-17 | 1 | -22/+21 |
| | | | |||||
| | * | Send KillPackets on the Task queue rather than the State queue | Justin Clark-Casey (justincc) | 2010-09-17 | 3 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Object updates are sent on the task queue. It's possible for an object update to be placed on the client queue before a kill packet comes along. The kill packet would then be placed on the state queue and possibly get sent before the update If the update gets sent afterwards then client get undeletable no owner objects until relog Placing the kills in the task queue should mean that they are received after updates. The kill record prevents subsequent updates getting on the queue Comments state that updates are sent via the state queue but this isn't true. If this was the case this problem might not exist. | ||||
| | * | 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 | 25 | -1191/+856 |
| |/ | | | | | | | MapAndArray collection | ||||
* | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 3 | -35/+107 |
| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
* | | Removing debug | root | 2010-09-16 | 1 | -1/+0 |
| | |