ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,950 Commits 5 Branches 88 Tags
714c082ca856a18292cee345d2b875006c41a6d5
Commit Graph

2835 Commits

Author SHA1 Message Date
Glenn Martin
91a55c0794 Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into moses.metricsPhase2 
Fixed conflicts.

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2015-05-19 14:07:44 -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
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
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
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
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
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
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
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
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
dahlia
83e58ebc7c oops someone set individual quaternion members and forgot to normalize 2015-03-17 13:14:03 -07:00
Justin Clark-Casey (justincc)
310e44f250 Re-enabled ability for avatar to ascend and descend whilst controlling view with lmb held down on avatar (in most viewers). 
This had been disabled by 30b7863 (Fri Feb 27 2015).
Relates to http://opensimulator.org/mantis/view.php?id=6835
 2015-03-17 18:55:33 +00:00
Robert Adams
00b5b915c7 BulletSim: add VEHICLE_ more parameter value limit checking. 
This only bounds passed parameters as there is no good way of refusing
the parameter setting. This mostly means that passing NaN's won't
crash the simulator.
 2015-03-07 17:47:40 -08:00
BlueWall
7e8bad05ec Fix erratic Npc movement 2015-03-02 20:09:22 -05:00
Freaky Tech
2482d567cf added missing senderId in GiveInventoryFolder this little mistake prevented passing on folders for HG visitors 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-03-02 15:59:49 -05:00
Justin Clark-Casey (justincc)
59d6d03909 Comment out now unused and not properly working private SP.m_leftButtonDown with a comment on how probably to implement it properly if it is needed in the future 2015-02-27 23:48:05 +00:00
Justin Clark-Casey (justincc)
30b786351e Don't slow down avatar walk speed if camera is changed (e.g. by holding down lmb on an avatar and moving the mouse). 
Does this by not applying unwanted direction components to the avatar self movement calculation (exception is flying in mouse look).
Matches behaviuor on linden lab grid
Addresses http://opensimulator.org/mantis/view.php?id=6835
 2015-02-27 23:43:12 +00:00
Justin Clark-Casey (justincc)
ca7cc9b2e2 Don't slide crouching avatar when camera is panned around them with left mouse button 
This matches linden lab grid behaviour
 2015-02-27 19:43:31 +00:00
BlueWall
aeb8a4bf85 Revert "Adding dynamic ossl permission control" 
This reverts commit a3681f3052 until
further testing. Jenkins now fails ossl tests.
 2015-02-27 12:27:10 -05:00
BlueWall
a3681f3052 Adding dynamic ossl permission control 
Add permission by identifying uuid (owner/creator/group) and function. Revoke
permission in the same manner. Permission adjustments immediately effect
running scripts ability to call os functions.

osGrantScriptPermissions(UUID key,string function) Threat Level Severe
osRevokeScriptPermissions(UUID key,string function) Threat Level Severe

work sponsored by: Rage
 2015-02-27 11:05:15 -05:00
Justin Clark-Casey (justincc)
412dd7dfc5 When an avatar is walking across a region border, force the first AgentUpdate received on the new root agent to update movement parameters. 
This prevents the avatar from drifting in its last direction of travel if a movement key was released at certain moments in the cross.
Relates to http://opensimulator.org/mantis/view.php?id=7435
 2015-02-26 00:48:51 +00:00
Justin Clark-Casey (justincc)
a03d893f2c Fix bug where the uuid gatherer was not inspecting UUIDs for items in an embedded object's inventory. 
Added regression test for this case.
Likely a regression since 08606ae4 (Thu Jan 8 2015)
Relates to Mantises 7439, 7450 and possibly others.
 2015-02-25 21:12:46 +00:00
Justin Clark-Casey (justincc)
b1b72d7c2f Reduce coupling in regression test task inventory creation methods to make them usable in tests with no scene present 2015-02-25 20:30:03 +00:00
dahlia
8b2af1071f Add NaN and Infinity tests for SOP Velocity and Acceleration setters. 2015-02-16 23:51:37 -08:00
dahlia
78814a1533 Use a boolean flag to signal lookat is running instead of Quaternion.Identity so it can be a valid target orientation 2015-02-16 19:42:36 -08:00
dahlia
2700b096bc Filter NaN and Infinity values at SOP AngularVelocity setter 2015-02-16 19:06:01 -08:00
Justin Clark-Casey (justincc)
dd6f560c05 If serialized scene object XML has a SavedScriptState with no UUID, then read past the innerXML instead of wrongly continously looping on the same element. 
Addresses http://opensimulator.org/mantis/view.php?id=7437
 2015-02-11 00:53:56 +00:00
dahlia
12119a9d7d llLookAt() strength parameter should slow rotation as it is increased. Thanks Vegaslan for pointing this out. 2015-02-07 17:39:46 -08:00
dahlia
2ed1afd32b llLookAt(): reduce and clamp strengh to reduce probability of overshoot 2015-02-07 14:17:37 -08:00
dahlia
506e62f815 llLookAt() and llRotLookAt(): all orientation updates now done via angular velocity manipulation. Also correct some orientation glitches during interpolation. 2015-02-06 22:36:26 -08:00
dahlia
3b7c3378f1 Manage Angular Velocity during llLookAt() rotation of physical objects 2015-02-05 23:13:06 -08:00
dahlia
ee810a2cb5 Set angular velocity in physics actor in SceneObjectPart.AngularVelocity setter. Enables llSetAngularVelocity() 2015-02-05 14:29:51 -08:00
Justin Clark-Casey (justincc)
1d2616e7a2 If the owner of an object is taking a copy from the scene (e.g. via the "take copy" option on a viewer) then only require owner copy perms, not copy and transfer. 
This matches Linden Lab behaviour and what was already possible via shift-copy.
Transfer would not apply here as the owner and copier are the same.
This is the only functional change, all other current take copy logic remains the same.
Adds regression tests around relevant take copy cases.
 2015-02-03 23:43:30 +00:00
Justin Clark-Casey (justincc)
d0a2ea0857 Fix regression where the stored state of every second script in an object rezzed from inventory (e.g. attachments) was no longer loaded. 
Likely a regression since f132f642 (2014-08-28)
Relates to http://opensimulator.org/mantis/view.php?id=7278
 2015-01-23 00:27:57 +00:00
Justin Clark-Casey (justincc)
aef6fd6927 If the SnedInventoryAync() method receives an exception log this but make sure it does not terminate the process. 
Relates to http://opensimulator.org/mantis/view.php?id=7421
 2015-01-21 20:54:23 +00:00
Justin Clark-Casey (justincc)
25dd30ddb6 minor: Fix some CR line endings in Scene.Inventory.cs 2015-01-21 00:33:54 +00:00
Justin Clark-Casey (justincc)
a846e63c70 If [Permissions] serverside_object_permissions = false or the undocumented propogate_permissions = false, don't propogate permissions of prim inventory items. 
This was a regression from 13f31fd (4 Nov 2013)
Relates to http://opensimulator.org/mantis/view.php?id=7399
 2015-01-21 00:21:27 +00:00
Justin Clark-Casey (justincc)
ac93ba9f85 minor: correct SceneCommunicationService.LogHeader spelling 
Relates to http://opensimulator.org/mantis/view.php?id=7337
 2015-01-20 00:19:33 +00:00
Justin Clark-Casey (justincc)
beef41f24c Stop simulators attempting to contact registered but offline regions (RegionFlags.Persistent but not RegioNFlags.RegionOnline) on startup and when an avatar completes a teleport. 
This eliminates spurious network calls and failure reporting.
This is done by adding RegionFlags to the GridRegion returned data in a backward compatible way as an alternative to multiple IGridService.GetRegionFlags() calls
Using a simulator or a grid service older than this commit will just see previous behaviour.
 2015-01-14 19:45:19 +00:00
Diva Canto
20b34135cb Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2015-01-09 08:32:40 -08:00
Diva Canto
e2dd15625f Added GetDisplayNames capability. For now, we don't actually use display names, and this cap returns the regular name. But this moves the server side into the newer, preferred, protocol used by the viewer for fetching the names of agents in the scene given their UUIDs. (the old protocol is via UDP). This works fine in my limited tests, but could use further testing by others. 2015-01-09 08:31:56 -08:00
Justin Clark-Casey (justincc)
801a86ca03 When inspecting a script or notecard, also try to look up any assets embedded therein. 
This is primarily to fix an issue where inventory items for NPC attachments would not be saved in archives as the assets referenced in the appearance notecard were not checked in this manner.
Relates to http://opensimulator.org/mantis/view.php?id=7376
 2015-01-08 20:36:03 +00:00
Justin Clark-Casey (justincc)
08606ae409 Make the IteratingUuidGatherer the only UuidGatherer. 
This UUID gatherer provides a superset of the previous gatherer's functionality
as it also allows the caller to control gathering iterations for load purposes.
 2015-01-08 20:21:40 +00:00
Diva Canto
bb82076a4d Allow for richer semantics of object derez. Specifically, allow the existence of region modules that do other kinds of garbage collection. Instead of placing deleted objects in the user's Trash folder, or deleting them immediately (UseTrashOnDelete = false), a module may decide to take garbage collection under its control. For example, it may place derezzed objects in a certain area inworld and delete them later. 2014-12-25 12:17:07 -08:00
Justin Clark-Casey (justincc)
e901253b49 Fix recent regression where a race condition meant SP.MakeRootAgent() would sometimes look to start attachment scripts before ETM.HandleIncomingSceneObject() had added them. 
Probably a regression since ghosts branch merge on Nov 26 2014
 2014-12-17 00:25:24 +00:00
Justin Clark-Casey (justincc)
f3ab7c0f5c refactor: rename IteratingUuidGather.AddAssetUuidToInspect() and RecordAssetUuids() to AddForInspection() as this properly describes what both of these methods do. 2014-12-05 00:21:42 +00:00
Justin Clark-Casey (justincc)
9208fb5d54 refactor: Make IteratingUUIDGatherer take a dictionary in its constructor like UUIDGatherer, so we can deal with future cases where the dictionary may already be pre-populated. 2014-12-04 23:55:59 +00:00
Justin Clark-Casey (justincc)
5861401faa Remove long unused region parameters from SceneBase. Some of these weren't even being set. Region parameters come from Scene.RegionInfo instead. 2014-12-03 21:44:22 +00:00
Justin Clark-Casey (justincc)
2d2aa6e076 minor: Just have one message that displays successful registration of a region with its parameters rather than 2 2014-12-03 21:40:39 +00:00