Commit Graph

27267 Commits (f0fa0d67e4cf778e77a90114d19b8e2dddf94746)

Author SHA1 Message Date
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
AliciaRaven 28ce323802 Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-04-17 19:37:18 -05:00
BlueWall 67d4e4475f Small fix for ini comments 2015-04-15 15:55:47 -04:00
Robert Adams 2e1f5bb011 Temporarily comment out OSSL enabled warning log message.
Added in wrong place. It is printed once per script rather than once per region.
2015-04-14 11:30:14 -07:00
Robert Adams e4e58fad32 Enable OSSL functions by default using the osslEnable.ini configuration file.
This changes OpenSim.ini.example to, by default, include osslEnable.ini which
turns on the OSSL functions and limits who can do which operations.
2015-04-14 07:17:54 -07:00
Robert Adams 520e6ed6f3 Remove ossl settings in XEngine section of OpenSim.ini.example with note to where
they were moved. At the moment, ossl settings are in the XEngine section although
  they should apply to any LSLish script engine. Moves all ossl settings to osslEnable.ini
Update osslEnable.ini with more decriptive comments and set some functions to be more
  restrictive -- especially the functions that allow scripts to do things to other
  avatars and prims.
2015-04-14 06:18:25 -07:00
Robert Adams d96d31be45 Add warnings in osslEnable.ini about use of osAvatarPlayAnimation which forces animations
on avatars without requesting user permission.
2015-04-12 19:32:06 -07:00
Robert Adams 9b337b089c Add osCheckODE() function so scripts can configure for running with legacy physics engine.
Function returns 'true' of the physics engine is configured to be 'OpenDynamicsEngine'.
  The presumption is that all other physics engines work the same (like SL) or it is a bug.
  Does not require ossl functions to be enabled.
2015-04-12 19:30:55 -07:00
Robert Adams 2a302d9a32 Move osslEnable.ini file from bin/ to bin/config-include.
Per comments, putting new configuration files in bin/ is not preferred.
Add comments and instructions to heading of osslEnable.ini.
Add a commented out include of osslEnable.ini to OpenSim.ini.example.
Fix line endings of osslEnable.ini to be Unix style.
2015-04-12 16:00:54 -07:00
AliciaRaven 1e444b1449 Change UserProfiles so that the parcel name is used for a ProfilePick and not the parcel owners name. This change also fixes a bug where if the avatar enters and does not move, creating or editing a ProfilePick would set the parcelId as an empty UUID. This is because ScenePresence.currentParcelUUID is not set until the avatar moves.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-12 15:36:22 -04:00
Magnuz Binder bdb91d0e70 Fix llTargetOmega non-physical gain.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-12 14:55:44 -04:00
Magnuz Binder beba2ce781 Fix stand position for differing seat and root rotation.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-12 12:53:47 -04:00
Robert Adams 01a6ce2baa Add the missing commas to parcel parameter setting in osslEnable.ini 2015-04-12 08:00:46 -07:00
Robert Adams d5ed6493d9 Add 'osslEnable.ini' file which enables a restricted set of ossl functions.
An 'include' in OpenSim.ini would enable the ossl functions but, for the moment,
the functions are still disabled by default and this file is an example
of what could be done.
2015-04-11 22:07:16 -07:00
Robert Adams 8d66284841 BulletSim: implement VEHICLE_REFERENCE_FRAME. Thanks Vegaslon!. 2015-04-05 20:20:37 -07:00
Robert Adams c0ad5ee81d varregion: update MapImageServiceModule to upload multiple map tiles for large regions. 2015-03-29 17:21:19 -07:00
Robert Adams 6081ae3554 varregion: update MapImageModule and ShadedMapTimeRenderer for variable sized regions. 2015-03-29 16:55:18 -07:00
Robert Adams df14b40e88 varregion: update LandManagementModule and LandObject for variable sized regions. 2015-03-29 16:45:00 -07:00
Robert Adams 07dead7dcb varregion: any conversions of use of Constants.RegionSize converted into
Util.cs routines to convert region coords to and from world coords or handles.
2015-03-29 14:25:12 -07:00
Robert Adams c5a7bf6601 varregion: add varregion and TerrainData use in LLClientView.
Add sending multiple parcel patches and sending patches by avatar
view distance.
2015-03-28 08:30:52 -07:00
Robert Adams 08c72a8dc1 varregion: remove use of Constants.RegionSize is various places.
More use of the Util routines for conversion of region handles into addresses.
2015-03-28 07:50:04 -07:00
Robert Adams bedafb8fae varregion: refactor use of 'double heightmap[,]' into references to new class TerrainData
and push the implementation from Scene into the database readers and writers.
2015-03-27 19:32:50 -07:00
Robert Adams d74d74c910 varregion: restore checkAgentAccessToRegion routine in EntityTransferModule. 2015-03-27 06:47:55 -07:00
Melanie Thielker 4b066d373b Comment spammy XMLRPC router message - we don't need to know every time a
script does something that wil fail anyway.
2015-03-25 19:14:30 +01:00
Melanie Thielker 752901c5f4 Make attachment rezzing async again for NPC. Doing that sync causes a deadlock
with the script thread.
2015-03-24 01:37:14 +01:00
Melanie Thielker 65c0c4be78 Allow re-setting the region restart timer. Also move restart notifications to
upper right corner again.
2015-03-23 22:19:33 +01:00
Melanie Thielker a2676388f4 Make the scripted dialogs and restart message appear in the top right corner
again. Viewers have been busy making these notifications all into toasts but
we believe there are message that are important enough to make the user
acknowledge them.
2015-03-23 22:17:51 +01:00
Melanie Thielker 5cb8127e87 Make log output of remote admin's restart region call reflect restart cancellations properly. 2015-03-23 22:16:49 +01:00