ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,020 Commits 5 Branches 93 Tags
abb3bb60a6ef0a3ed92d3fa54dc47d4d3e560b36
Commit Graph

14536 Commits

Author SHA1 Message Date
Magnuz Binder
abb3bb60a6 Fix mesh cache race condition in llCastRay V3. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-23 08:14:28 -04:00
Magnuz Binder
fdc383a843 Use own mesh cache in llCastRay V3 after throttling. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-22 01:21:50 -04:00
Magnuz Binder
7d26815d0e Throttle llCastRay V3. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-22 01:21:18 -04:00
Melanie Thielker
edcba95ab5 Merge branch 'master' into moses 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2015-05-20 23:40:52 +02:00
Talun
d9afe354ac New values returned by llGetEnv 
Implements recent changes to llGetEnv
region_cpu_ratio hardcoded to 1
region_product_sku hardcoded to OpenSim

Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-20 14:36:54 -04:00
Michael Heilmann
946a6622fe Removing duplicate definition 2015-05-19 15:52:13 -04:00
Michael Heilmann
140ea04b9d Merging Opensim upstream before generating patch 2015-05-19 15:18:45 -04:00
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
dahlia
6a48c87cd2 resolve possible nullref when sending appearance packet. Thanks to zadark for pointing this out. 2015-05-13 15:59:58 -07:00
BlueWall
3c2886cd75 Adding back command to clear region's user cache 2015-05-13 14:31:28 -05:00
AliciaRaven
cb586d1158 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. 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. This version fixes issues where scripts in child prims were not detected and also blocks grab for attachments.

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-05-13 12:16:14 -05:00
Magnuz Binder
d348f87161 Patch llCastRay fully simplified to V3. 2015-05-12 15:40:42 -07:00
Diva Canto
3c596e47c6 Knocked off a few compiler warnings regarding unused variables. 2015-05-10 21:54:24 -07:00
Dev Random
f20728fc86 Constrain 'terrain modify' to selected Region 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-09 15:25:33 -04:00
Diva Canto
0bf1209f90 Another major overhaul of inventory downloading, this time pertaining to inventory links. Added yet another function to IInventoryService to get multiple items at once, so that fetching collections of linked items is done once per folder instead of once per item. 2015-05-08 20:53:28 -07:00
Diva Canto
c74cef0f42 Major change in the way inventory is downloaded: added a method throughout IIventoryService that fetches sets of folders at once. Also added folder id in the InventoryCollection data structure, so that we don't need to go to inventory server again just for that. This reduces the chatter between sims and inventory server by... a lot. On my tests, this reduces initial inventory download down to 30% of what it currently is. 2015-05-07 19:24:08 -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
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
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
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
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
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
Diva Canto
da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -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
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
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