Commit Graph

27894 Commits (c94c929ec16a9731e636b30e6536f39ee7ad1ecf)

Author SHA1 Message Date
Diva Canto ca4569eeb4 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2015-05-07 12:38:40 -07:00
Diva Canto cc1fc400d8 pCampbot: added behavior that mimic initial inventory download. It's not exactly what the viewer does, but it's close enough, and the elapsed time can be measured. 2015-05-07 12:37:49 -07:00
Michael Cerquoni dc4c9b1bb0 Minor whitespace removal 2015-05-07 14:09:29 -04:00
Dev Random a9dd3028b9 Add 'terrain modify noise' and code cleanup
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-07 14:07:50 -04:00
Dev Random 4bf62e11b6 'terrain modify' command for area-of-effect operations
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-06 13:55:22 -04:00
Michael Heilmann ff40cc43fa Merge pull request #5 from gamucf/moses.metricsPhase1
Moses.metrics phase1
2015-05-06 11:33:02 -04:00
Diva Canto 8676b017b2 Attempt at fixing mantis #7054. The two inventory threads are stepping on each other's feet. This needs real-world testing, as I'm not sure of all the consequences of reducing the number of worker threads to 1. 2015-05-05 21:28:27 -07:00
Diva Canto 1192ca36e9 Forgot this file in the last commit 2015-05-05 21:07:04 -07:00
Diva Canto 1abbad71b4 Refactored some code that is used in two different dlls related to SOP rewriting. Also added some unit tests that relate to mantis #7514 2015-05-05 20:59:09 -07:00
Michael Cerquoni 44b8b9fef6 Revert "Patch llCastRay fully-simplified to V2." for further review.
This reverts commit c96ee68953.
2015-05-04 16:23:16 -04:00
Michael Cerquoni dfb73c1464 fix a minor whitespace issue 2015-05-04 15:56:12 -04:00
H-H-H 49991d055a Adding the command <dobackup>to opensim console which requires a region name as an argument and will do an oar of that region if the autobackup module is enabled
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-04 15:53:31 -04:00
Talun 382e05df14 Missing constants for llGetObjectDetails
OBJECT_BODY_SHAPE_TYPE
OBJECT_HOVER_HEIGHT
OBJECT_LAST_OWNER_ID
OBJECT_RENDER_WEIGHT

Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-04 13:18:52 -04:00
Steven Zielinski 96a86e7d5a Fixed a bug that would cause the sim extra stats reporter to fail in reporting stats. The bug was caused by the current process threads which can return null references.
Test Plan: Tested on windows using opensim standalone and the json stats.

Reviewers: rlouden, ssirigam, clattin, martin, kboswell

Reviewed By: rlouden, ssirigam, clattin, martin, kboswell

Differential Revision: http://cr.irl.ucf.edu/D277
2015-05-04 13:17:11 -04:00
Magnuz Binder 5a2440dfdf Implement llGetGeometricCenter correctly.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-04 13:14:09 -04:00
Magnuz Binder c96ee68953 Patch llCastRay fully-simplified to V2.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-04 12:44:58 -04:00
Steven Zielinski cb517839e9 Fixed vocabulary in a comment to match the code. 2015-05-04 10:05:36 -04:00
dahlia df12fbb0d2 add new config parameters for llCastRay to OpenSimDefaults.ini 2015-05-04 00:32:22 -07:00
Magnuz Binder 43b8bd0c35 Implement llCastRay fully, simplified. 2015-05-03 23:41:11 -07:00
Robert Adams 30f9e5372e Only send parcel layer data around the point of interest. Can be disabled
by setting [LandManagement]LimitParcelLayerUpdateDistance=false
New parameters added to OpenSimDefaults for the distance and enablement.
2015-05-03 21:56:41 -07:00
dahlia 73efb1633f lock collision mesh cache when accessing 2015-05-03 19:54:03 -07:00
dahlia 60e719286b Make Meshmerizer mesh cache static so it can be shared across class instances 2015-05-03 17:05:48 -07:00
Diva Canto 877371411a Mantis #7514
I think this is it -- a bug introduced back in October, where the prefix and name space were being added twice on HG asset posts bu simulators.
2015-05-02 22:18:58 -07:00
Diva Canto 09edc9619a It wasn't that. Revert "Mantis #7514"
This reverts commit 365f46bfa9.
2015-05-02 22:15:26 -07:00
Diva Canto 365f46bfa9 Mantis #7514
Mono bug introduces double xmlns attribute names when rewriting the asset in HGAssetService, e.g.  <SceneObjectPart xmlns:xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xmlns:xsd="http://www.w3.org/2001/XMLSchema">.
Solution: remove all attributes before saving.
2015-05-02 20:40:37 -07:00
Diva Canto 4211309ec7 Corrected typo in namespace 2015-05-02 10:27:57 -07:00
Steven Zielinski c4a3c93097 Fixed a bug that would cause the sim extra stats reporter to fail in reporting stats. The bug was caused by the current process threads which can return null references.
Test Plan: Tested on windows using opensim standalone and the json stats.

Reviewers: rlouden, kboswell, clattin, martin, ssirigam

Differential Revision: http://cr.irl.ucf.edu/D277
2015-05-01 17:09:18 -04:00
Glenn Martin 72e17b0219 Merge remote-tracking branch 'upstream/master' into moses.metricsPhase2
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2015-05-01 14:11:16 -04:00
Glenn Martin bdde6f1d1b Merge remote-tracking branch 'upstream/master' into moses.metricsPhase1 2015-05-01 14:07:36 -04:00
Steven Zielinski 625452b84b Updated phase 2 to have the changes originally done in phase 1 for the defaultNumberFramesStored.
Test Plan: Tested using opensim standalone on windows with json stats.

Reviewers: rlouden

Reviewed By: rlouden

Differential Revision: http://cr.irl.ucf.edu/D275
2015-04-30 16:02:45 -04:00
Diva Canto da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -07:00
Diva Canto 0303112dcb Added new [Statistics] config section to go with the previous patch. 2015-04-29 18:42:20 -07:00
Steven Zielinski 59778cfc2a Added in all metrics for Phase 1 except for Time Dilation.
Test Plan:
Tested on local opensim and firestorm. Not tested with JSON stats
reporter.

Reviewers: rlouden

Reviewed By: rlouden

Differential Revision: http://cr.irl.ucf.edu/D269

Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-04-29 18:22:24 -07:00
Steven Zielinski cb3c6038af Changed the 10 value to be a constant value inside of the Scene called m_DefaultNumberFramesStored.
Test Plan: Tested on windows with the json stats reporter.

Reviewers: rlouden, kboswell, clattin, ssirigam, martin

Reviewed By: rlouden, kboswell, clattin, ssirigam, martin

Differential Revision: http://cr.irl.ucf.edu/D273
2015-04-29 16:20:03 -04:00
BlueWall e171ae899d Revert "Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)"
We found that linksets can move if the root prim is unscripted. Will revert this until a fix can be implemented.
2015-04-28 17:24:54 -05:00
Steven Zielinski bebdc29eff Changed the 10 value to be a constant value inside of the Scene called m_DefaultNumberFramesStored.
Test Plan: Tested on windows with the json stats reporter.

Reviewers: rlouden, ssirigam, martin, kboswell, clattin

Differential Revision: http://cr.irl.ucf.edu/D273
2015-04-28 16:56:53 -04:00
BlueWall 38459104eb Revert "Revert "Fix the click to buy prim dialog not being displayed with alpha viewers after recent changes to viewer code by LL.""
This brings back the fix for recent viewer click to buy prim dialog which was reverted after some reports of objects being altered when touched.
2015-04-28 09:36:56 -05:00
BlueWall d80230adcd Revert "Fix the click to buy prim dialog not being displayed with alpha viewers after recent changes to viewer code by LL."
See: http://opensimulator.org/mantis/view.php?id=7426#c28089

Reverting this commit due to unwanted effects.
2015-04-27 15:46:09 -05:00
AliciaRaven cde4e7ec86 Fix the click to buy prim dialog not being displayed with alpha viewers after recent changes to viewer code by LL.
Recent viewer changes by linden lab now require more information when requesting prim tooltip data. The object properties must now be sent when the viewer requests the object family properties used to display the tool tip. Thanks to Liru for finding the viewer commit that broke this feature in OS.

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-04-25 00:06:48 -05:00
Michael Heilmann e7f2b77bfb Merge pull request #1 from gamucf/moses.metricsPhase1
Moses.metrics Phase1
2015-04-22 13:42:48 -04:00
Robert Louden 2e7ace4e25 Readded file to repository. Acciedently removed. 2015-04-21 18:42:30 -04:00
Steven Zielinski 0b3adc961b Added in all metrics for Phase 1 except for Time Dilation.
Test Plan:
Tested on local opensim and firestorm. Not tested with JSON stats
reporter.

Reviewers: rlouden

Reviewed By: rlouden

Differential Revision: http://cr.irl.ucf.edu/D269
2015-04-21 17:33:26 -04:00
Robert Louden 9822692c12 Phase 2 additons with Frame Dilation metric.
Test Plan: Compiles and runs successfully.

Reviewers: szielinski

Reviewed By: szielinski

Differential Revision: http://cr.irl.ucf.edu/D268
2015-04-21 16:59:43 -04:00
Robert Louden c3138f9f38 Phase 2 additons with Frame Dilation metric. 2015-04-21 16:15:48 -04:00
Glenn Martin 1959eb8372 Moved over metrics from previous OpenSim 0.8.0.3 repository (this new repository is now the master branch from OpenSim). 2015-04-21 14:29:17 -04:00
Magnuz Binder e855c8e711 Allow setting profilecut diff to 0.02 from scripts just like from viewer.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-20 16:42:06 -04:00
AliciaRaven f11720d71f Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)
This patch fixes permission issues with dragging scripted objects. As on LL grid, scripted prims can not be dragged now. Also after dragging, the group was not marked as updated. This meant that after the region was restarted the group would revert to its original position.

Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-20 16:38:37 -04:00
Magnuz Binder 263db44129 Implement llGetBoundingBox fully.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-20 16:23:34 -04:00
Robert Adams 7d699514a5 Revert "Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)"
This change sees to enable general moving of objects with touch scripts.
Reverting until the move permissions are understood.

This reverts commit 28ce323802.
2015-04-19 20:22:55 -07:00
tglion b4347cf214 Avoid deadlock in NPCModule between DeleteNPC and GetNPC on m_avatars
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-04-18 08:08:33 -05:00