53895289a6
remove Ode.Net - missing file. ( old ode may be broken now)
2015-11-20 18:48:48 +00:00
25983c1ba9
remove the hard to maintain Ode.Net wrapper only in use by old ode
2015-11-20 18:25:56 +00:00
ca5ec4c33b
make llAvatarOnLinkSitTarget(0) return UUID.Zero
2015-11-20 01:44:19 +00:00
4a0531244a
change a log message from error to just Debug
2015-11-20 00:45:12 +00:00
98a00cbce5
ubOde: add threading related calls new ode.dll may need. Hope this doesn't break with current linux ode library
2015-11-20 00:37:41 +00:00
0c93159297
remove unused return value on DeliverMessageTo()
2015-11-20 00:09:56 +00:00
278687b1e8
remove duplicate object chat messages ( mantis 7745 ),fix llRegionSay, this are still merge issues
2015-11-20 00:01:13 +00:00
36f7e96392
clean code a bit
2015-11-19 15:02:12 +00:00
2e43343ca9
ClearPartAttachmentData before adding object to scene, not after
2015-11-19 14:45:39 +00:00
8505ca88dd
work around some 'tests' errors: use one autoresetevent per scene
2015-11-19 02:46:25 +00:00
759fda0871
work around some 'tests' errors: reset the event at start of new test.
2015-11-19 02:43:49 +00:00
9c5acb3df4
work around some 'tests' errors: just a test
2015-11-19 01:43:33 +00:00
f242137e31
work around some 'tests' errors: add a DefaultPermitions module to sceneB
2015-11-19 01:18:34 +00:00
a4ed111de1
cleanup indentation
2015-11-18 17:45:56 +00:00
6dafce9a12
fix another variable number of wearable types issue
2015-11-18 17:35:26 +00:00
0fbb4f0067
work around some 'tests' errors: dont expect a particular http error response
2015-11-18 01:05:46 +00:00
62cacff071
add LegacySitOffsets handling at LSL api
2015-11-17 18:17:11 +00:00
da5aad87bf
start adding LegacySitOffsets option. TRUE will prevent the use of new math for the compensation of SL sittarget bug, and so not break content. (this is the main code change)
2015-11-17 17:41:09 +00:00
0991ad321a
work around some 'tests' errors: UUID.Zero is a invalid ownerID
2015-11-17 08:58:00 +00:00
6c766f3ab4
remove unused parameter - missing file
2015-11-17 08:02:48 +00:00
f7f5aba597
remove unused parameter
2015-11-17 07:59:11 +00:00
cd29abf1ac
work around some 'tests' errors: fix wrong parameters
2015-11-17 07:22:36 +00:00
81b7f5551c
work around some 'tests' errors: sp attachments and appearance are not in sync
2015-11-17 06:52:03 +00:00
51d0087a49
work around some 'tests' errors: AgentGroupDataUpdate is udp
2015-11-17 06:42:45 +00:00
2ba14f82fe
work around some 'tests' errors: a new event queue has a few null events
2015-11-17 06:23:57 +00:00
bbfeca4b0c
work around some 'tests' errors: a new event queue has a few null events
2015-11-17 06:19:45 +00:00
16d158f2f1
work around some 'tests' errors: missing call to InventoryDeQueueAndDelete()
2015-11-17 05:49:39 +00:00
9566c000f2
work around some 'tests' errors: terrain effects limits changed
2015-11-17 05:25:08 +00:00
dd18c9f689
fix llRequestAgentData cache timeout
2015-11-17 05:14:54 +00:00
364082d0e8
work around some 'tests' errors: add a httpserver
2015-11-17 04:19:30 +00:00
1e87e90915
work around some 'tests' errors: allow sitTargetposition and orientation to be read from OAR on opensim, they are reset at avination, this may cause issues with old sits
2015-11-17 03:42:46 +00:00
4e74564caa
work around some 'tests' errors: suspend TestllSetLinkPrimitiveParamsForAgent bc avatar sit math changed
2015-11-17 03:16:37 +00:00
d1737de8d2
work around some 'tests' errors: Coalesced objects handling has changed
2015-11-17 03:10:59 +00:00
8567ef3c40
work around some 'tests' errors: test for null cacheItems
2015-11-17 03:00:27 +00:00
ec0a16c559
work around some 'tests' errors: suspend sit on sittarget until im not 2 sleepy to fix the math
2015-11-17 01:53:44 +00:00
083b52173b
work around some 'tests' errors: suspend undo-redo tests until new ones can be written to conform to new code
2015-11-17 01:44:15 +00:00
e15ebc091f
bug fix: improve chat to child avatars. Still not good because of low resolution of child position updates
2015-11-17 01:31:06 +00:00
67aefb5e42
bug fix: StateSource of a SOG that is not a attachment is StateSource.PrimCrossing
2015-11-17 00:48:35 +00:00
895a57e426
work around some 'tests' errors: backup is async
2015-11-16 23:25:28 +00:00
9c5646a1ba
work around some 'tests' errors: dont use references to objects that may have been deleted
2015-11-16 23:21:58 +00:00
52a3cc39e9
work around some 'tests' errors: fix math
2015-11-16 22:41:36 +00:00
3a65627481
work around some 'tests' error: internal GroupResize() doesn't heave Undo
2015-11-16 21:42:39 +00:00
10d5c80910
work around some 'tests' error: object is deleted on DeRezObjects, fix last commit side effects
2015-11-16 21:28:59 +00:00
ca4b7efd0f
dont find parts of groups marked as Deleted
2015-11-16 21:11:22 +00:00
99ecf522cd
work around some 'tests' error: object is deleted on DeRezObjects
2015-11-16 20:59:57 +00:00
250db8c82a
work around some 'tests' error: object crossing is async
2015-11-16 20:34:23 +00:00
d19e4f598f
deatach from backup on attachment
2015-11-16 20:12:40 +00:00
9b6633697b
coment out excessive debug messages
2015-11-16 17:35:20 +00:00
f5799ff445
That didn't actually do anything for Simian, and it broke the locahost
...
case
Revert "Also restoring proper function for Simian external GetTexture functionality."
This reverts commit 366e81b977
2015-11-14 08:10:27 -08:00
55cce6aee0
minor: reset character collision flags, even if without a Body
2015-11-12 22:40:55 +00:00
9bd6befdeb
add some safeguard checks
2015-11-12 21:24:14 +00:00
8c7f475740
Add some values to the SimulatorFeatures cap's OpenSimExtras section:
...
SimulatorFPS: The actual optimal FPS of the simulator, un-fudged
SimulatorFPSFactor: The fudge factor that is applied to the stats sent to the viewer
SimulatorFPSWarnPercent: The percentage below which a lag meter should go to amber
SimulatorFPSCritPercent: The percentage below which a lag meter should go to red
To display the real values, a viewer would divide the reported FPS by the SimulatorFPSFactor and use that to calculate the percentage of SimulatorFPS. E.g. reported is 55fps, SimulatorFPSFactor is 5.0 and SimulatorFPS is 11.
2015-11-12 21:13:44 +01:00
d3911606ef
Move a call to RequestModuleInterface to a new scene callback function
...
because the current implementation would have always returned null
2015-11-12 20:34:09 +01:00
649a3fc39c
dont abort llDialog if buttons labels are longer than 24bytes, let udp truncate. This is not as spec but allows old scripts or with minor bugs to still work
2015-11-11 06:06:22 +00:00
adda0ab7d8
limit llDialog buttons text to 24 bytes (at lludp level)
2015-11-11 05:55:34 +00:00
2b937fdf40
reduce the small MTU violation sending terrain compressed patchs
2015-11-10 23:56:08 +00:00
188b2d84c1
increase the number of packets in Land queue that force terrain to delay patchs sending.
2015-11-10 23:50:00 +00:00
e096b49dd7
check if a packet can be sent imediatly without accounting it as sent on throttles when it is enqueued for later send.
2015-11-10 23:17:56 +00:00
40cb83b555
make m_minimumDripRate a bit larger than mtu. Add a bucket space check that does not consume avaiable space, so reducing bandwidth
2015-11-10 22:50:20 +00:00
f57a48a0fb
fix silly bug
2015-11-10 20:34:19 +00:00
5bfd49404d
start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug on slow terrain send limits check
2015-11-10 17:44:53 +00:00
b6c3592411
fix/add lldialog and llTextBox message size error checks, aborting if error as spec. (we can change this to silent truncate and execute the larger ones since llUdp now does it. But doing as spec now)
2015-11-10 15:08:08 +00:00
38aad774f7
change lldialog and llTextBox maximum message lenght to 512 bytes as specification.
2015-11-10 14:47:36 +00:00
d17633f6c0
replace StatisticsFPSfactor that needed to be changed with FrameTime to a simpler true or false Normalized55FPS that is now TRUE by default. Incorrectly this commit also contains changes that should had their own commits: changes to heartbeat time control ant to gathering and calculation of related statistics.
2015-11-09 15:06:41 +00:00
097c56330a
rename MinFrameTime as FrameTime, since it is not a minimum but a target value; retune its value a bit so reported FPS is closer to integer value; change ode step size acording to reduce jitter in phys FPS; Make Statistics Scaling factor (fludge factor) configurable. (legacy default of 5.0 in code)
2015-11-08 04:28:46 +00:00
185d3bd39e
change maximum angular velocity to a value derived from heartbeat rate and Nyquist.
2015-11-08 01:47:54 +00:00
eccc6f1081
fix wrong condition to set low angular velocity as Zero.
2015-11-08 00:24:54 +00:00
69fefd1d00
send the estimation of time dilation at packet build time, not the one at unknown past.
2015-11-06 21:27:42 +00:00
527ea37540
change OfflineMessageModule from new avination code to original master, for compatibility with current web servers php scripts. This may change after current test phase
2015-11-06 05:18:54 +00:00
f8efd00775
add a console/log warning about large physics meshs on ubOde that can have negative impact on region load
2015-11-05 16:57:48 +00:00
dc752e8d82
fix get/set parameters on avatars
2015-11-05 03:07:25 +00:00
89655b0baa
apply OtakuMegane code changes to irc channel chat so some characters are not lost
2015-11-02 02:23:35 +00:00
3da0a318b3
Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into avinationmerge
2015-11-01 23:40:54 +01:00
aea86f30a0
Don't crash the sim if the map image is null.
2015-11-01 11:38:41 -08:00
5f18f2ce6a
More EntityTransferContext plumbing
2015-11-01 19:37:14 +01:00
69585a4824
More plumbing of the EntityTransferContext (not yet complete)
2015-11-01 19:11:14 +01:00
54e1d54fb5
fix more merge issues
2015-11-01 03:33:19 +00:00
24472c3b67
fix merge issues
2015-11-01 03:25:36 +00:00
72684592ba
Merge branch 'master' into avinationmerge
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2015-11-01 03:01:59 +00:00
9ba288a2e7
fix typo reported on mantis 7735
2015-10-31 22:48:31 +00:00
af4ca8e80e
fix internal support for non square regions
2015-10-31 21:58:40 +00:00
ea56f4f27c
Introduce an EntityTransferContext carrying the version numbers to pass
...
to all interested functions. Should fix the varregion conditional.
Still a testing version, do NOT use in production!
2015-10-31 18:13:02 +01:00
e8e0ba6d8f
Remove testing cruft that is blocking the new protocols. Unit tests no
...
longer test TP v1 now.
TP v1 will be removed within 6 months anyway.
2015-10-31 17:22:27 +01:00
ed909f56da
fix mantis 7734, Thanks Garmin for the report
2015-10-31 13:22:50 +00:00
9232876421
let silly tests override version on local connections
2015-10-31 02:05:11 +00:00
f0fd028ed9
Merge branch 'master' of opensimulator.org:/var/git/opensim
2015-10-31 00:06:34 +01:00
dc6d9eadf3
Testing stage of the new versioning system. Use at own risk. May not
...
work. Will eat your babies. Yada. Yada.
2015-10-31 00:01:35 +01:00
dd9b06e3b6
fix mantis 7733, reverting setting of IsAttachment on first call to full check. Replace instead same simple IsAttachment tests by full checks
2015-10-29 22:14:11 +00:00
114ac59314
dont tell clients that we can edit a friend's attachments when we do forbid it
2015-10-27 01:20:21 +00:00
9e6d9e0436
friends rights to edit objects display on viewers fixed. This needs to be optimized in future
2015-10-27 01:17:32 +00:00
1982d72320
Make changes to a friend rights reach him on another sim; find on map does show the region. Issues: precise location on region still not avaiable and object edit permitions on viewers edit are not being updated (but are enforced by region). friends information is updated, and warnings are displayed. Only did minor testing...
2015-10-26 22:42:48 +00:00
6821ace3c6
add basic SendFindAgent() to lludp. Future use may require a list of pairs (X,Y). For now one pair is good enough.
2015-10-26 21:56:02 +00:00
8922d58f05
try fix IRC connector issue on mantis 7731 but with code a bit diferent from proposed patch. Also append '@irc' to nick on region messages, so message origin is clear
2015-10-26 18:00:01 +00:00
c3532ba876
set SOG.IsAttachment when doing a full check, so future gets see the right value
2015-10-25 19:59:05 +00:00
8d33ab903b
merge issue: fix missing '/'
2015-10-24 22:48:31 +01:00
28d4afbe3a
replace objects scale clamp by a more readable clamp. Simplify GroupResize and let rescale factors < 1 also be checked for size limits, Set new scales directly not checking them again.
2015-10-23 01:39:53 +01:00
8ed17f745d
let ode also finish internal representation of prim actors, before simulation
2015-10-22 18:03:49 +01:00
7cb6ecb9f5
Make physics engines finish internal representation of loaded prims before starting simulation so it does start for all at same time. Currently only in use by ubOde
2015-10-22 17:34:28 +01:00
7aaa84515f
rename terrain for opensim and respective configuration flag that a future costumized ODE library may have
2015-10-22 16:20:19 +01:00
e464bf5d82
recover scripts execution time stat i lost on previus changes. Behing async, this will not add with other time stats giving total frame time, as happens on other simulators. But its a good diag stat.
2015-10-21 18:34:06 +01:00
f84b75b1e0
update ubOde hashspaces levels
2015-10-21 01:50:28 +01:00
44deac4c1e
we do not have prims with size 2^128, missing file
2015-10-21 01:41:04 +01:00
c37ea1910d
fix or remove some wrong ODE configuration settings
2015-10-21 01:11:39 +01:00
deb4364f42
remove the use of Vector3 for axis locks on the rest of engines
2015-10-21 00:15:09 +01:00
ce5d5fc8dc
the inertia matrix inversions and body inertia changes to implement axis locks need to be avoid, so use ubOde axis locks code. Hopefully this will not cause incompatibilities
2015-10-21 00:01:23 +01:00
747044f587
stop using a vector3 to store axis locks 3bit flags also in ode
2015-10-20 23:57:57 +01:00
f6891b36be
stop using a vector3 to store axis locks 3bit flags in ubOde
2015-10-20 19:33:15 +01:00
0045398324
move ugly convertion of axis locks 3 bit flags to a wasted vector3 down to PhysicsActor. Let engines use LockAngularMotion with either Vector3 argument or byte
2015-10-20 19:00:26 +01:00
d8528a7ba0
add axis locks to sop serializer. Now they are also saved to inventory
2015-10-20 18:37:24 +01:00
3c69071145
also apply axis locks, when creating a prim physics actor
2015-10-20 18:21:13 +01:00
52860a7d15
stop using a Vector3 to store 3bits
2015-10-20 16:55:18 +01:00
dfd60d6f71
STATUS_ROTATE are linkset flags and not prim
2015-10-20 15:37:43 +01:00
59b63b6406
On to 0.8.3!
...
Conflicts:
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
2015-10-18 21:51:49 -07:00
839e239c99
Added warning in RegionCombinerModule about it being considered obsolete and encouraging people to switch to varregions.
2015-10-18 21:50:11 -07:00
06d2508b96
On to 0.8.3!
2015-10-18 21:47:10 -07:00
e6163c990e
Added warning in RegionCombinerModule about it being considered obsolete and encouraging people to switch to varregions.
2015-10-18 16:59:47 -07:00
7ab633461e
Fixed merge conflicts
...
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2015-10-18 16:24:33 -07:00
70a46fe090
Clean up of simulation version, the number that rules the compatibility of teleports:
...
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
2015-10-18 16:06:31 -07:00
a31e5e799e
stop a object when making it not physical
2015-10-18 00:35:52 +01:00
24435cfe9a
Fix wrong active angularlock detection (it was only burning cpu), stop trying to add a amotor to each child prim and stop using unnecessary trimeshcallbacks
2015-10-17 21:56:15 +01:00
e2d7e6290d
fix GetTerrainHeightAtXY also on master. Fix wrong active angularlock detection (it was only burning cpu), stop trying to add a amotor to each child part and fix a typo.
2015-10-17 20:07:52 +01:00
8dcb4de53c
fix GetTerrainHeightAtXY for large regions. Also change ode dispose()
2015-10-17 14:42:04 +01:00
f39e6bc482
bug fix. Some rare meshs reported as having +-infinity dimensions
2015-10-15 19:06:39 +01:00
e14e432b50
More exception catching in ODE at shutdown. Not sure why the exception happens.
2015-10-14 17:57:13 -07:00
366e81b977
Also restoring proper function for Simian external GetTexture functionality.
2015-10-14 14:45:21 -07:00
45b8e6c1a7
Fixed exception upon shutting down in plain ODE.
...
09:49:57 - [SHUTDOWN]: Ignoring failure during shutdown - System.NullReferenceException: Object reference not set to an instance of an object.
at OpenSim.Region.PhysicsModule.ODE.OdeScene.Dispose() in f:\dev\opensim-core\OpenSim\Region\PhysicsModules\Ode\OdeScene.cs:line 4062
2015-10-14 09:56:23 -07:00
8d7fa62088
fix a typo..
2015-10-14 04:06:17 +01:00
7deaad7368
bug fix, and make Mesh-Mesh and Mesh-Terrain collisions a lot softer
2015-10-14 02:32:51 +01:00
9ec9eee75f
reduce jitter due to viewer interpolators on objects that are really almost at rest
2015-10-13 23:03:51 +01:00
2e2c1a1fcd
change fps and dilation (still something not that usefull). make collisions a bit less explosive.., do changes on own time limited loop and not on simulation loop, ...
2015-10-13 23:01:54 +01:00
f360ddd28e
rename UbitMeshmerizer class as ubMeshmerizer
2015-10-13 11:08:54 +01:00
8e333c953d
in stats use real integration time, not the wanted one. Dont let stats calls overlap using a proper lock object
2015-10-12 11:29:13 +01:00
3d8384b696
detect a fully degenerated mesh and avoid using it and so crashing ubOde
2015-10-12 00:49:07 +01:00
af5ea18f33
use System.IO.Compression.DeflateStream for mesh decompression like master, since ACE zlib does seem to fail to decompress some meshs present at OSG, (possible same issue happens with map with option to draw prims)
2015-10-11 23:04:22 +01:00
88763178c5
display prim name, if unzip of selected phsyics mesh part fails on ubMeshmerizer ( thx Dan)
2015-10-11 20:17:58 +01:00
2b354902b5
fix the casting to Boolean of lsl types vector,quaternion,list and rotation, so that if(variable) does compile and work. key still requires a explicit compare to NULL_KEY
2015-10-08 06:27:37 +01:00
3a498b0637
change NPC restriction options default from restricted to all allowed, as master
2015-10-08 02:39:14 +01:00
2700231764
in llAttachToAvatarTemp() (TempAttachmentsModule) dont add to inventory, like master
2015-10-04 03:34:55 +01:00
e1ce04de42
Implement an overridable implementation of PhysicsActor.SetVehicle()
...
that works for all physics engines.
BulletSim: implement an optimized version of SetVehicle() that still
uses the vehicle code to do bounds checking but does it in one taint
operation.
2015-10-02 18:35:02 -07:00
124602c6c2
reduce some diferences with master
2015-10-02 22:47:31 +01:00
d900d0112d
put back ip check on llSetContentType
2015-10-02 18:55:09 +01:00
b8cb9d1bbb
also on another location, plus a bit clean
2015-10-02 18:39:05 +01:00
de51b7af85
do group SetPos sync as master, script thread does need to wait for it to be done. This needs improvement, doing it async again with script thread waiting watching coop
2015-10-02 17:56:02 +01:00
bdd7ea06ff
change llSetContentType to master version, but removing IP check
2015-10-02 17:45:48 +01:00
1af6ac4bfc
remove unused method parameter master also removed
2015-10-02 17:44:19 +01:00
31873485d9
do not send DisableSimulator on teleport if agent is already returning
2015-10-02 02:42:25 +01:00
6ae7341e42
send DisableSimulator messages on closing childagents. Possible still not on at best timming, or on the right source files
2015-10-01 20:50:12 +01:00
6bc479fecd
make bakes reception handle empty BakedTexture elements. But at same time stop sending them, only sending to Xbakes server items that do have a texture, like master does
2015-10-01 19:30:37 +01:00
2abe1ccc59
change GetNewRezLocation physics ray results processing
2015-10-01 14:47:32 +01:00
e110ca24cf
remove a forgotten if that is actually only a statement
2015-10-01 14:37:24 +01:00
7e8544f26e
fix missing clear of queued timer even and state transition flags on scripts reset
2015-10-01 05:20:04 +01:00
6df75a927c
let hoverheight rest position be a falling state
2015-09-30 20:37:14 +01:00
aa3303e3af
add get method on physics actors PIDHoverActive
2015-09-30 20:13:31 +01:00
f87e284ec2
first steps adding suport for llSetHoverHeight() called from attachments on ubOde. Sure needs work.. like sp motion control still assumes stopped and not falling state. Only very basic test on flat land done
2015-09-30 19:14:37 +01:00
4a2e6db344
add high level code suport for SetHoverHeight() called from a attachment, so in future physics engines can also suport it
2015-09-30 17:34:25 +01:00
d281ec5342
some fixes/changes on land send
2015-09-30 06:09:01 +01:00
0151c773e2
let sp know about scene before anything else on creation
2015-09-30 06:05:28 +01:00
5b7a3c703d
clamp all draw distance changes within region limits
2015-09-30 05:57:02 +01:00
feb78b2910
add several options for NPC creation so abusive use can be reduced (restrictive by default) UNTESTED
2015-09-30 02:45:11 +01:00
1124d14eb0
remove some restrictions on NPCs creation
2015-09-29 22:15:56 +01:00
3e9b326fcc
clean some spacing issues
2015-09-29 21:44:25 +01:00
0b21724fe4
try fix some whitespaces VS decided to change
2015-09-29 02:29:55 +01:00
f2c8f83215
add processing of AvatarGroupsRequest message that should be used to get other avatars group memberships, but keep it disabled since some viewers no longer suport it correctly and expect memberships in reply to avatar properties, so we need to keep wasting bandwith sending useless information when some viewers really only want avatarproperties
2015-09-29 01:43:49 +01:00
cf6856a8df
remove groups handlers onClientClosed
2015-09-28 21:00:08 +01:00
f97807b53f
let us see our online friends
2015-09-28 20:57:33 +01:00
028cbb7cbe
remove a auxiliar vector no longer needed
2015-09-28 18:10:27 +01:00
ad58f9b17e
recover a lost position check for mega regions
2015-09-28 17:55:35 +01:00
fb69661bb9
... ossl merge issue
2015-09-28 16:40:55 +01:00
fd20a9576d
... post merge issue
2015-09-28 16:03:10 +01:00
93af984e94
add missing handlers for preferences
2015-09-28 13:22:32 +01:00
6e12836d71
change copyright to opensim
2015-09-28 13:08:46 +01:00
380d1c1d5a
change copyright to opensim
2015-09-28 12:58:23 +01:00
55d0425dfe
add missing handlers for preferences
2015-09-28 12:47:29 +01:00
04b32e1982
let SendAvatarGroupsReply fall back to UDP if no caps and make use of it
2015-09-27 07:07:40 +01:00
18536b4be6
add missing SendAgentGroupDataUpdate to llClientView
2015-09-27 06:38:19 +01:00
1e23b3482c
AvatarGroupsReply message does not have ListInProfile fields
2015-09-27 06:21:38 +01:00
b269185031
several changes to xmlrpcGroups. Packets AgentData and AgentGroupData are private to the requesting agent, etc
2015-09-27 06:10:12 +01:00
238b32d95f
in xmlrpcGroups send all groups on MakeRoot. this will slow down crossings even more, but viewers seem to need it now, something to review later
2015-09-26 19:17:59 +01:00
ae195632e9
add the Default Groups module lost in the merge
2015-09-26 18:18:29 +01:00
239dcaffb7
coment out some debug, clean a bit
2015-09-26 14:14:05 +01:00
05db03e809
fix unscripted sits without physics help
2015-09-26 03:14:06 +01:00
d0a7e5bd78
fix object rez on terrain, i broke adding physics assistance
2015-09-26 02:33:57 +01:00
0fb033e567
fix object crossings to other scene on same instance
2015-09-26 01:31:57 +01:00
07a8618c56
revert previus wrong commit
2015-09-25 21:43:51 +01:00
40ae9ec554
patch objects crossings for var regions, until region location is fully fixed
2015-09-25 18:38:52 +01:00
e6f675b81b
rearrange source code
2015-09-25 17:41:50 +01:00
2b0587770a
add butterflies to terrain
2015-09-25 05:46:06 +01:00
13b8b17b9a
we still don't have extended wind and cloud neither do viewers
2015-09-24 20:55:39 +01:00
a6b8eb7bca
some cleanup on terrain encoder
2015-09-24 19:11:17 +01:00
f484773447
save a few more bits per flat patch
2015-09-24 15:23:52 +01:00
58daecfccb
don't mess ray direction..
2015-09-24 06:57:53 +01:00
af34bfddd1
add physics assistance on placement of a new object. This may help on mantis 7727, but may still need more work
2015-09-24 06:46:07 +01:00
5ca610d56a
bug fix, let ubODE see more than one mesh on cast ray
2015-09-24 06:32:40 +01:00
8fde2fb901
slow down terrain sending so other users of LAND queue do have a chance to send things
2015-09-24 00:35:06 +01:00
c83351b9c0
fix the DC term on flat patch encoding
2015-09-23 22:35:27 +01:00
63bc0b574f
speedup flat terrain patchs encoding, plus a few minor changes.
2015-09-23 21:04:13 +01:00
592ba85b0a
add Culture.FormatProvider on all casts to LSLString on Vectors and Quaternions. This may need better checking
2015-09-23 17:04:48 +01:00
9e183cbd30
fix for future non square regions
2015-09-23 03:31:23 +01:00
5f5dbfc264
same for old Ode
2015-09-23 01:50:59 +01:00
43ca70655f
remove a odd floating offset on physical prims/terrain collisions
2015-09-23 01:42:24 +01:00
ccfb561e8d
change the encapsulation of compressed land patchs in llUDP packets
2015-09-23 00:01:32 +01:00
778793d77f
fix GetPacketsQueuedCount typos in last commit
2015-09-22 19:24:58 +01:00
ae70f61a64
let minimum wqburst be a bit larger than MTU
2015-09-22 18:56:03 +01:00
a8dc07ff5c
removed a protocol breaking lludp debug option that no one should try, changed terrain send throotle to be by packets in queue, reduced odds of MTU violation on terrain send (still bad). Most UDP protocol implementations may not mind much, but our code still does
2015-09-22 18:39:59 +01:00
032958709b
last merging of sog m_linkedAvatars into m_sittingAvatars - untested.
2015-09-21 21:49:51 +01:00
a6b8cc9887
replace LSL reference to sog GetLinkedAvatars
2015-09-21 21:38:50 +01:00
25677e4a1b
try to remove Scenepresence dependence on sog m_linkedAvatars, sitting may still work
2015-09-21 21:31:01 +01:00
04800a7570
add missing sit check
2015-09-21 19:56:59 +01:00
b412db72be
Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more.
2015-09-21 11:00:34 -04:00
a81a1865b5
coment out lludp debug things that only fill up the help screen
2015-09-21 12:13:59 +01:00
33b4077c2c
revert my change to the range of greyscale image maps, setting it back to 0 - 127.5 so not to break loading of old files. There isnt a range that fits all needs anyway
2015-09-21 00:44:53 +01:00
fe5807cd09
fix terrain save greyscale mapping to 1:1 suporting standard 0-255m range and not only 0-127m. Jpeg format still using a non standard color encoded heightmap
2015-09-20 15:31:38 +01:00
56a4b5ba7a
put back the hack to make viewers display map tags (now and then at least) that i had removed and do it also on the local region. Make parcel overlay a bit less transparent than i did before.
2015-09-19 21:30:09 +01:00
ba4d0c1c6f
a few more changes to worldMap. Use ExpireCaches, cache remote mapItems requests, etc
2015-09-19 06:42:52 +01:00
87ad573ec2
MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thing
2015-09-18 02:00:10 +01:00
4798cce390
sync remote responses for mapItens with the local ones, but sending all valid information, so later we can cache/throotle
2015-09-17 21:51:51 +01:00
ab18c801a9
dont block a region just bc it doesnt have the requested map item
2015-09-17 21:17:04 +01:00
f4093a04e7
dont create terrain map asset for V1 viewers on large regions again, but do create parcel overlay since current viewers seem to use it (or we are missing something elsewhere)
2015-09-17 21:11:59 +01:00
6bca0c9c9c
recover bulletS fps math change lost in merge
2015-09-17 08:45:52 +01:00
812e808cee
remove messages on agents cross fails that got merged
2015-09-17 08:18:35 +01:00
d767feafa4
generate maptile assets again, v2 do use at least the parcels overlay
2015-09-17 05:24:19 +01:00
f6c2e6e1a3
merge issues and a few more changes
2015-09-17 05:10:24 +01:00
133f3a41eb
remove bad merge code..
2015-09-17 01:43:10 +01:00
2f1eab2792
remove bad merge from master
2015-09-16 16:34:16 +01:00
9ac01010f4
change point of evocation of AgentHasMovedAway for HG
2015-09-16 04:32:09 +01:00
2bd7bbd1cb
restore some avn code, fixing for var regions
2015-09-16 02:25:12 +01:00
b9137e2dee
avoid a null ref (that should not happen after last commit), also reduce use of thread jobs, where one is good enought
2015-09-15 22:30:39 +01:00
3906bb2749
fix missing check for viaHGLogin
2015-09-15 22:24:50 +01:00
2d88e4cf73
mute watchdog timeouts on world map work threads. They do wait for events for a long time
2015-09-15 04:56:26 +01:00
5becc16acf
try to improve vehicles crossing with Xengine. Lag seems main issue now, but needs testing, specially the fail cases, that most likelly need more work
2015-09-14 16:40:01 +01:00
f24414c063
Remove the last proprietary copyright headers, insert BSD ones.
2015-09-13 21:03:38 +02:00
672f7468f7
change the names also on the assembyInfo files
2015-09-13 00:05:29 +01:00
209cb840a2
missing file...
2015-09-12 21:56:07 +01:00
e9a56d5e19
rename Ubit physics modules
2015-09-12 21:38:26 +01:00
280780d3bc
let regionCache really find a varregion by a position
2015-09-12 15:27:36 +01:00
dfc142a50f
try to be more friendly to HG
2015-09-12 14:37:07 +01:00
0eba5d25c3
revert validating Library textures. Those need to be on a grid assets or will not work anyway
2015-09-12 12:51:47 +01:00
8e920ac59d
try to validate textures from library folder
2015-09-12 07:24:35 +01:00
118aff520e
try to better merge avn and os fetchinventory and fetchinvdescendents
2015-09-12 06:10:52 +01:00
61ad58310b
fix the typos that seem to matter so much to some :p
2015-09-12 02:21:27 +01:00
8621abf2b7
send a reply on UpdateInventoryItem with the transactionID viewer sent. Protocol seems to have also a callbackID on this, apparently ignored by viewers ( as possible the transactionID )
2015-09-12 02:05:52 +01:00
410ae96d04
put back diva's cache with her recent fix but also avoid duplicated InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it
2015-09-11 22:26:05 +01:00
08187cb599
inventory mess return to the state before divas cache issue
2015-09-11 20:40:10 +01:00
af0febf6a7
inventory mess
2015-09-11 19:55:38 +01:00
a6012a3fae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-09-11 09:49:33 -07:00
29aaf5564f
Mantis #7720 : AssetXferUploader was setting AssetID to UUID.Zero. Before that wouldn't matter (item would be a terminal object) but with the introduction of the item cache, it matters, because the object in the cache was being modified to have AssetID=UUID.Zero. Also keeping the item cache consistent when item properties change.
2015-09-11 09:48:51 -07:00
7841628313
change to avn fecthinventory and webfecth.. code
2015-09-11 16:25:46 +01:00
6a0465b70a
remove diva's inventory cache since it seems to cause mantis 7720, broken items UUID. Guess it doesn't cover all paths
2015-09-11 04:46:15 +01:00
2bd8fb6b5a
add a few terminating / in LSLhttp uris as core
2015-09-10 13:17:50 +01:00
daf8a4d01d
fix lost sending of initial terrain to child agents
2015-09-10 01:02:52 +01:00
5e12bc452d
minor clean, letting small classes be own module class
2015-09-09 19:03:31 +01:00
47aa8107fd
let old ode also have a Module class
2015-09-09 18:53:24 +01:00
e1a8125b4f
found core hack to fix modules interdependencies RegionLoaded is not that obvius
2015-09-09 17:55:46 +01:00
8571736ff3
split Module from its scene, so if not enabled there is no scene memory allocation. All physics modules need this ( if not others)
2015-09-09 17:15:04 +01:00
9a919bac3f
demote ConvexDecompositionDotNet to a simple dll, i had made it a region module
2015-09-09 15:07:35 +01:00
52fb24ade5
retouch ubitode module
2015-09-09 14:27:21 +01:00
e26d0ee40a
Make sure the chat module doesn't deactivate just because the section
...
heading is missing
2015-09-09 05:40:39 +02:00
ece4088a45
add missing llSetVelocity stub
2015-09-08 21:53:52 +01:00
254008cd1f
and now.. seems to work.. but does it really work?
2015-09-08 21:41:52 +01:00
6dc4c8321d
properties folders
2015-09-08 20:44:20 +01:00
40fd7cbf74
a mess with Modules and Module
2015-09-08 20:03:54 +01:00
339f60e990
more on compile..
2015-09-08 18:45:53 +01:00
ecc1969857
more on compile..
2015-09-08 18:13:15 +01:00
e8d5f23fc4
opps my files?
2015-09-08 17:34:27 +01:00
5c619fe0ab
opps my files?
2015-09-08 17:21:45 +01:00
d2d34a473d
rename Ubitode
2015-09-08 17:17:09 +01:00
774c42e7fb
fix some compile
2015-09-08 17:02:44 +01:00
31afc76fcf
fix some compile
2015-09-08 16:51:42 +01:00
971b613d08
fix some compile
2015-09-08 16:47:31 +01:00
5b3e2ab9aa
Merge branch 'mbworknew1' into ubitworkvarnew
2015-09-08 15:03:22 +01:00
4dd17c4117
More 'everything is a module' merging.
...
Have most of UbitOde converted.
There are compile errors in OpenSimBase as the new modules stuff is not all there.
Removed ChOdePlugin as it's connection to OdePlugin was tangled.
2015-09-08 06:15:46 -07:00
29d78f7e3a
add script events per sec stat, using the time report code, but ignoring the time for nowwq
2015-09-08 14:13:56 +01:00
e5367d822b
Merge of ubitworkvarnew with opensim/master as of 20150905.
...
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
c4c6fcf7ad
fix missing proprieties get, etc
2015-09-08 12:43:54 +01:00
2a84ef861a
improve old ODE prim region borders
2015-09-07 13:27:13 +01:00
7276a89ddd
recover opensim m_sendTerrainUpdatesByViewDistance. if false do as opensim (slower since it depended on sending terrain as TASK). if true send by view range and also all terrain at arrival
2015-09-07 11:23:00 +01:00
abd6640453
allocate llRAW LookupHeightTable on demand and release it, saving a few 512KB of memory
2015-09-07 08:06:41 +01:00
3a8e76cdd1
restore terrain modifiers, left out earlier bc of merge errors, (untested)
2015-09-07 07:50:51 +01:00
45046858a1
Typos in comments
2015-09-06 14:57:18 -07:00
16025fa34b
remove a forgotten cast to int
2015-09-06 20:28:59 +01:00
af440162f7
minor change, add a lock we had at avn
2015-09-06 20:22:44 +01:00
82ea4179da
Clean up viewer-based access control specifications.
2015-09-06 10:00:20 -07:00
d9fafd9603
fix the missing initialization of the folish ProcessUnackedSends option
2015-09-06 17:12:31 +01:00
3a0137cb45
fix odd drawdistance control initialization
2015-09-06 16:36:30 +01:00
93b9a92990
add missing stub for llSetVelocity
2015-09-06 04:55:58 +01:00
94d13c6d22
dont store/upload map asset for large regions, ( needs testing)
2015-09-06 01:21:20 +01:00
c1a4786be0
still a missing stat ID
2015-09-06 01:01:31 +01:00
0ddcc55166
let extra stats travel side by side with viewers ones... try to fix damm array indexes all over the place
2015-09-06 00:32:20 +01:00
c2346a0823
Changed a couple of comments to be more generic
2015-09-05 10:28:44 -07:00
13b1c5dfce
let ode suport var size regions
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-09-05 10:17:30 -07:00
2210c5807f
Fixes a problem with Bullet physics when it is configured to run on a separate thread.
2015-09-04 16:33:07 -07:00
d7f22fb2cc
POSScene wasn't really a region module. Fixed now.
2015-09-04 15:48:59 -07:00
a32187f53a
Moved UserStatistics feature to OptionalModules too.
2015-09-04 15:28:51 -07:00
49d19e3650
Moved DataSnapshot feature to OptionalModules too.
2015-09-04 15:17:53 -07:00
f9a7099abc
Moved RegionCombinerModule to OptionalModules. Removed it as its own top-level project/dll.
2015-09-04 15:12:36 -07:00
2130984bef
a few changes to stats. Array order coerent on users. give up on moses stats for now, since SimExtraStatsCollector cant reach SimStatsReport etc
2015-09-04 23:07:25 +01:00
d00f73c3a4
Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework.
2015-09-04 14:39:23 -07:00
218eb908be
In SceneGraph, use the property PhysicsScene instead of the variable _PhysScene, so that it gets properly initialized before being dereferenced.
2015-09-04 10:54:04 -07:00
9d7e310e21
Deleted commented code
2015-09-04 09:40:21 -07:00
9aaaf705f5
actually reduce max number of ode spaces
2015-09-04 16:37:45 +01:00
ce1c5de793
bug fix on ode spaces and allow more of them on large regions
2015-09-04 15:47:21 +01:00
a54e0339ef
remove a forgotten 1000.9 factor on physics fps
2015-09-04 14:33:46 +01:00
08f9c54554
use GetTimeStampMS to increase heartbeat and stats timing resolution. some rearrange on stat code ( MOSES special ones still out )
2015-09-04 12:05:31 +01:00
ac4b2b2f50
normalise physics plugins to return fps as (simulated time / requested simulation time). improved a bit old ode simulations per call math
2015-09-04 09:42:33 +01:00
dac8edd5dd
Transformed the LLUDP ad-hoc plugin into a region module. It works.
2015-09-03 15:59:06 -07:00
1434cb88fd
a bit better addAvatar() call chain
2015-09-03 22:22:59 +01:00
2f9a018bc8
make addavatar more friendly between plugins
2015-09-03 22:09:27 +01:00
7bfa311e32
fix a old bug i added: MaxWearables can't be changed in runtime
2015-09-03 20:51:30 +01:00
5aa7a4fa52
fix CM_api compile error
2015-09-03 20:22:39 +01:00
db6c4a89a8
minor clean
2015-09-03 20:05:17 +01:00
cdaed11387
at last we can login and see objects ( friends is dead and disable in
...
scenepresence)
2015-09-03 18:39:08 +01:00
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
0235e58fff
Moved ExtendedPhysics from OptionalModules to Bullet project, because it's very much an optional Bullet feature. This way, Bullet doesn't need to depend on the OptionalModules dll. No changes in configs or behavior.
2015-09-01 09:20:20 -07:00
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
9435405ca1
Deleted physics plugin classes.
...
More unit tests fixed.
2015-08-31 16:23:43 -07:00
50e7e38f45
Physics refactoring: all unit tests pass.
2015-08-31 15:04:10 -07:00
11194209df
First commit where physics work as region module.
...
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
2015-08-31 14:09:15 -07:00
134d4300f0
All physics plugins are now region modules. Compiles but doesn't run.
2015-08-31 13:02:51 -07:00
49ab478d28
Fixed a namespace dependency. Also started preparing prebuild.xml for making physics region modules.
2015-08-31 09:41:00 -07:00
3741edd1c7
Refactored Meshing modules:
...
- Moved ZeroMesher from OpenSim.Region.PhysicsModules.SharedBase to OpenSim.Region.PhysicsModules.Meshing
- Created subfolder for all Meshmerizer files, also in the same Meshing dll
- Made them both region modules, with ZeroMesher being the default one
This compiles but doesn't run yet.
2015-08-31 09:21:05 -07:00
31a50a73cb
dont change camera on crossings
2015-08-31 14:21:50 +01:00
4905c74ddf
start sending terrain patchs in completmovement where we know its
...
position. Also reset camera to position on makeroot
2015-08-31 14:08:32 +01:00
0900f9dd7f
fix slow moving physical objects moving without sending updates
2015-08-31 13:06:41 +01:00
ce2c67876e
More namespace and dll name changes. Still no functional changes.
2015-08-30 21:05:36 -07:00
c24f3b4f5e
minor changes
2015-08-31 04:37:52 +01:00
2c0cad6dd3
Renamed the namespaces too
2015-08-30 20:29:31 -07:00
1d6b33bc2d
Major renaming of Physics dlls / folders. No functional changes, just renames.
2015-08-30 20:06:53 -07:00
5648eb7bd1
Moved instantiation of SceneCommunicationService object to inside the scene constructor. This was a left over from the original monolithic design of scene communications. The less the instantiators of scenes know about the scene's internals, the better.
2015-08-30 15:52:26 -07:00
0edffae7e4
more on tps and crossings
2015-08-30 19:17:35 +01:00
f6d79c7cbb
Mantis #7713 : fixed bug introduced by 1st MOSES patch.
2015-08-30 11:07:27 -07:00
bd11311845
improve object crossings
2015-08-29 09:18:34 +01:00
207dd6da48
fix some effects ranges
2015-08-29 05:28:13 +01:00
b114a04ed4
fix NeighborRegions code
2015-08-29 03:41:43 +01:00
8a8acc41bb
stop sending parcel overlays on parcels crossings since SL seems to have
...
stop sending also
2015-08-28 03:59:25 +01:00
efc062b0cc
send land parcels overlay in cat Land not Task, or avatar freezes
2015-08-28 03:34:28 +01:00
c967ecf0c7
also limit terrain flood effects ( like on pait change this should have
...
no visible impact, just cpu saving)
2015-08-28 02:33:54 +01:00
bd4ec5f26c
restrict terrain PaintBrushes to the requested area
2015-08-27 22:36:14 +01:00
f9efa23d5e
remove the rest of #justEditedTerrain, it was sending patchs non
...
conforming to protocol, and no longer in agreement with how patchs are
schedule to send
2015-08-27 21:30:51 +01:00
195dd054de
make terrain undo non op, it is broken and can't be global but per agent
2015-08-27 21:07:16 +01:00
d1b4e0dd6a
fix terrain bake for revert. just good enought fix
2015-08-27 19:20:41 +01:00
030c866b34
rename revert map as baked map, bc thats what it is
2015-08-27 15:48:13 +01:00
b82b16c954
take taints check terrain out of Onframe event and add a new event for it. Slow it down to 1/4 heartbeat rate (once every 363ms aprox)
2015-08-27 15:01:15 +01:00
c7ddb790a7
change osd encoding of region size
2015-08-27 04:45:16 +01:00
e2cfc73293
NEVER EVER SEND TERRAIN PATCHS AS UNRELIABLE!!!!!!!!!!!!!!!!!!!!!!!!!!
...
this costed me hours :P
2015-08-26 15:20:18 +01:00
ce883e9b43
add more of the v03 checks and homeURL. Sending side only for now
2015-08-26 05:29:08 +01:00
73124f22cc
change teleport version number to v0.3, without actually adding the checks
...
for 0.7 sims, etc that we don't have. Also still not using the homeURL
added in core.
2015-08-26 03:21:48 +01:00
f4f3b18221
fix bug
2015-08-25 20:08:05 +01:00
22f573a0be
update raw32 file reader to core one. Warning only suports square regions
2015-08-25 20:00:31 +01:00
244f0c6352
change terrain internal representation to float. ushort work with legal
...
sl terrain, but may break existent terrain and that may cost a lot more
than the cost of memory
2015-08-25 16:51:48 +01:00
64d05bab0f
terrain stored as ushorts with gzip compression
2015-08-25 13:36:45 +01:00
1c752296bf
change internal representation of terrain from int to ushort. This will
...
suporte height from 0 to 655.53m that includes SL limits ( still need to
add code to trap eventual negative values from dbs or user input)
2015-08-24 18:40:28 +01:00
3829df1059
try to implement core load oar options
2015-08-24 17:05:16 +01:00
9a490ad2b9
Revert "BulletSim: delay adding a scene presence to the list of presences"
...
Remove these changes until the region crossing problems can be figured out.
This reverts commit 062ec0efbd
2015-08-24 06:39:06 -07:00
cbc569a1e0
rename ImapTileModule as IMAPImageUploadModule to match core
2015-08-24 11:06:12 +01:00
018d855f28
turn off KeepAlive
2015-08-24 07:38:33 +01:00
062ec0efbd
BulletSim: delay adding a scene presence to the list of presences
...
until it is fully configured. Another addition to fixing the
collisions stopping problem.
2015-08-23 21:15:04 -07:00
11209c72f5
In ScenePresence, when removing from the physical scene, unsubscribe
...
from collisions before removing the collision callbacks.
Should not make operational differences.
2015-08-23 21:13:40 -07:00
722d00903b
Add Culture.FormatProvider to String.Format, like it is done for LSLFloat
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-24 01:21:33 +02:00
87247dc2c9
Just replace all m_data accesses with accesses to Data, which is
...
protected against nullrefs
2015-08-24 00:08:08 +02:00
ca53671691
add missing culture format on lslvector toString
2015-08-23 17:31:15 +01:00
a9beee7050
Revert "Revert "Fix a possible nullref caused by accessing m_data rather than Data""
...
Needed after all
This reverts commit 26094c21fe
2015-08-23 17:48:48 +02:00
c4ea4ea000
Fix the nullref in scripts - the right way
2015-08-23 17:36:08 +02:00
26094c21fe
Revert "Fix a possible nullref caused by accessing m_data rather than Data"
...
My bad!
This reverts commit 20326e1947
2015-08-23 17:34:20 +02:00
e8a75151fa
more on world map
2015-08-23 04:55:18 +01:00
24a093035b
more fixes on map
2015-08-23 01:42:51 +01:00
5da9979024
Warp3D map now seems to work
2015-08-22 16:35:49 +01:00
d22d46ee96
update MapSearchModule
2015-08-22 13:41:45 +01:00
5b03a04fb0
fix worldMapModule
2015-08-22 11:56:01 +01:00
e3d82ad706
delay terrain sending if land queue is 2 busy
2015-08-22 04:08:30 +01:00
17082da0da
"uglyfy" GetModifiedPatchesInViewDistance. Also make it use camera or
...
avatar position
2015-08-21 20:19:04 +01:00
4bb55cad67
dont use SendTerrainUpdatesByViewDistance option, code executes as true.
...
the option will have other use
2015-08-21 03:04:52 +01:00
6555bbffaa
remove the noise part on the PinHeadIsland. why to want something that
...
does not compress well on island?
2015-08-21 00:47:44 +01:00
f6a59f74ab
remove a 256m check
2015-08-21 00:35:55 +01:00
512c892d83
send regions size on map blocks
2015-08-20 20:18:15 +01:00
63f13b901a
ubitode a bit more friendly for megas (still disabled)
2015-08-20 18:15:58 +01:00
379362facf
make basic ode work with var regions for contribution back to CORE. ( avn
...
partial compatibility code needs to be reverted). Cant fully test.
2015-08-20 17:04:37 +01:00
e312a0bc90
make it compatible with avn, no point making avn compatible with it
2015-08-20 14:18:17 +01:00
43a83da5ce
update old git to os core version
2015-08-20 13:45:45 +01:00
e1a455eae5
Fix multiple moving_end and add moving_start to llSetKeyframedMotion
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-20 00:24:14 +02:00
028506cf3c
Partial plumbing for the agent stateful module features negotiation
2015-08-20 00:18:45 +02:00
35cbe76f27
Merge branch 'master' of opensimulator.org:/var/git/opensim
2015-08-19 23:34:13 +02:00
20326e1947
Fix a possible nullref caused by accessing m_data rather than Data
2015-08-19 23:33:38 +02:00
7633ebf36f
Add explicit initialization because mono 3 doesn't like what mono 2 allows
2015-08-19 23:18:40 +02:00
662b59af83
Convert the lsl list type into a struct. EXPERIMENTAL! This may affect
...
the llSetPrimitiveParams family of functions adversely. Please test!
2015-08-19 23:14:11 +02:00
9a0040d67c
put back entities remove from updates on SendKillObject.
2015-08-19 20:38:49 +01:00
ac83525bde
another funny bug (mine this time)
2015-08-19 19:55:24 +01:00
d2776ec645
funny bug
2015-08-19 17:14:29 +01:00
601914ecd8
find sending of initial terrain using PushTerrain as os core
2015-08-19 16:28:03 +01:00
7661366223
minor change
2015-08-19 15:24:12 +01:00
abeb2ec4b3
ubitode varsize ( Mega disabled till better checks )
2015-08-19 14:26:14 +01:00
2e15ed80cd
fixes on warp3D
2015-08-19 12:08:45 +01:00
0af2fafddf
add missing regionExtent setup and Scene physicsscene configuration ( not
...
exactly as core)
2015-08-19 11:04:28 +01:00
0b105da626
Merge branch 'mbworkvar2' into ubitvar
2015-08-19 08:48:50 +01:00
f17b5c5985
Merge branch 'master' into ubitworkmaster
2015-08-19 02:47:14 +01:00
fd82a0a0b7
add a Retry-After response header to the 503 sent when we are 2 busy to do
...
the request. just 503 could mean server down (?)
2015-08-19 00:26:43 +01:00
25335b0707
Some unit tests are simply broken and create an API with a null m_item.
...
This isn't supposed to be done and should be changed in the tests.
For now, add a protective check.
2015-08-19 01:19:25 +02:00
c61aee12d4
Fix adding a scalar to the end of a list
2015-08-19 01:04:10 +02:00
62f3399559
Try to address Mantis #7689 . When adding a scalar to a list, make a copy
...
as is done when adding another list.
2015-08-19 01:00:42 +02:00
05d72f77ff
do keepalive on mesh and texture GET. Dont use reusecontext any where.
...
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
2015-08-18 21:32:03 +01:00
c53f732163
Change the IScriptApi back to it's original form, removing XEngine
...
specific additions that should not have been there in the first place.
Sleeping and time measurement are now completely internal to XEngine
2015-08-17 21:46:30 +02:00
ee7debcca6
Revert "When scripts are sleeping, don't count that as execution time"
...
The approach is good but the way it is written breaks the architecture.
Rewrite follows.
This reverts commit a568f06b7f
2015-08-17 18:11:45 +02:00
1de5612d8b
Merge branch 'master' of opensimulator.org:/var/git/opensim
2015-08-17 18:08:32 +02:00
664ecb1938
Prevent the spammy "many event" message from appearing in normal use.
...
Console command debug xengine now turns that on.
Also, per orenh, remove the triggers at 1000 and 10000 as they are not
useful now that top scripts works.
2015-08-17 18:05:39 +02:00
0cdd1165c8
Minor improvement of previous patch.
2015-08-16 21:23:41 -07:00
fc6fe75268
MANTIS-7684 - Use the user management module to get username for script dialogs
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-08-16 21:13:42 -07:00
c83da03183
Create want and need lists for agent data interchange formats.
2015-08-16 01:45:15 +02:00
0f8a7982dc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-08-15 16:08:42 -07:00
4cbbbefbf6
Removed ignoreCase=true from the call to Type.GetInterface, because, well, we don't want to ignore case. And this seems to be causing problems in mono 4.3.
2015-08-15 16:08:14 -07:00
2374c4a4c1
Adding the IAgentStatefulModule interface. It is used in addtion to
...
one of the existing module interfaces to denote a module that holds
agent specific state that should be transferred to other regions
2015-08-15 19:08:45 +02:00
1fb2f0296f
Track selected objects per client
2015-08-15 02:46:41 +02:00
4f3198da22
Only send the requested ObjectPropertiesFamily in the RequestObjectPropertiesFamily reply and not the actual ObjectProperties packet
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-15 01:57:25 +02:00
a5967d918a
Send a proper ownerid for Object messages to conform with what viewer expects
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-15 01:18:20 +02:00
e9067c133c
Remove DOS line endings from LSL_API.cs
2015-08-13 01:34:18 +02:00
a22e6cb7f5
Whitespace borkness?
2015-08-12 09:13:45 -07:00
f25c67ea1d
Send correct uuids in the FromID and ID packet fields for llInstantMessage
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-08-12 09:08:01 -07:00
59da146e9d
When the user stops a script, have it remain stopped
...
Previously the script state was never saved for a !Running script, so upon region restart the script would be Running again.
The use of the 'StayStopped' flag is needed because all scripts are automatically stopped when the region shuts down, but in that case we shouldn't save in their state that they're !Running.
2015-08-11 08:44:27 +01:00
a568f06b7f
When scripts are sleeping, don't count that as execution time
...
Sleeping doesn't use the CPU.
2015-08-11 08:44:27 +01:00
d24528b3bc
Show Script Time in the statistics panel
...
The value shown is the number of milliseconds per frame that were spent executing scripts in this region.
2015-08-11 08:44:26 +01:00
5679cd0100
Changed "Script Execution Time" to be the gross time, i.e. including handling it in XEngine
...
Previously the "Net Time" was reported: only the time actually spent in the script's code. This is not a correct indication of how much load the script places on the simulator, because scripts that change state often or have many events use up a lot of time just in the event handlers, and previously this time wasn't counted.
2015-08-11 08:42:31 +01:00
a3bed1fbcb
Report "Script Execution Time" as the time spent executing the script in the last 30 seconds. Use a sliding window to calculate this.
...
Notes:
- This metric provides a better indication of which scripts are taking up a lot of CPU (and therefore should be optimized).
- Previously the execution time was reset to 0 in every new measurement period, causing the reported time to fluctuate for no reason. This has been fixed by using a sliding window.
2015-08-11 08:42:26 +01:00
287096d826
Improved calculation of Script Execution TimeStarted
...
1. Use a Stopwatch (a high-resolution timer)
2. Whenever we start a new measurement period, zero out the total execution time (previously it just kept accumulating)
3. Changed the measurement period from 30 minutes to 30 seconds. This is much more useful in the "Top Scripts" dialog, as it shows currently active scripts
2015-08-11 07:35:41 +01:00
20af31f18e
Fixed mistakes related to confusion between Environment.TickCount (milliseconds) and TimeSpan.TicksPerXXX (10000 x milliseconds)
2015-08-11 07:35:40 +01:00
4c6fb9fb64
Log scripts that have processed many events: this is probably an indication of a problem
2015-08-11 07:35:39 +01:00
7457173fe4
Fixed calling "debug xengine log" without the 'level' parameter: this should show the current log level; not crash
2015-08-11 07:35:38 +01:00
4ad1468165
Better handling of invalid XML: a) prevent infinite loop on EOF; b) better logging
...
If the XML was truncated for some reason then ExecuteReadProcessors() would get into an infinite loop, using high CPU. Now it detects EOF (and several other error cases) and aborts.
The rest of the changes just improve logging of XML in case of errors, so that we can see what the bad XML is.
2015-08-11 07:35:37 +01:00
373455a6fa
Fixed mistakes in string format specifiers (e.g., "{0)" instead of {0}")
2015-08-11 06:16:23 +01:00
fe37cb9990
BulletSim: rearrange code and add different locking to eliminate chances
...
of race conditions and, especially, race conditions when an object is
removed and quickly re-added to a scene.
This hopefully reduces the occurance of problems when avatars TP within
a region -- the main problem being the loss of collisions.
2015-08-09 15:36:50 -07:00
fe86df0ec9
BulletSim: update the motion actors so they completely clean themselves
...
when Dispose() is called. This reduces chance of object leakage when
destroying objects.
Rearrange initialization and shut down of BSActorLockAxis so it is
consistant with other actors.
2015-08-09 15:34:06 -07:00
959872315f
WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum.
...
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
2015-08-08 12:12:50 -07:00
2153a01cc7
Have osAvatarName2Key check the cache first, even for foreign users
...
Another change: removed the second call to userManager.AddUser(). UserManagementModule won't modify an existing record.
2015-08-07 11:34:52 +03:00
5a1279af8a
BulletSim: clean up some code for axis locking. No functional change.
2015-08-06 21:48:50 -07:00
f0417c5d50
BulletSim: rearrange code and add some tests to try and resolve the
...
initialization race conditions reported in Mantis 6792.
When a region is initializing it seems that the prim initialization code
can be interrupted part way through then taints are processed for
prims that are not completely there.
2015-08-06 19:57:32 -07:00
86c426e587
create osGetAvatarHomeURI
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-04 18:09:13 +02:00
b5be5ca490
Make osAvatarName2Key() able to get names from unknown HG users
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-04 18:08:54 +02:00
5a59a6d445
Removed unused variable
2015-08-03 15:31:48 +03:00
fdb7a804fc
Add an option to processes physics collisions using FireAndForget.
...
Off by default but set with [Startup]ShouldUseFireAndForgetForCollsions=true
There is a problem with physics colliions sometimes stopping. One suspicion
is that the long callback path from the physics engine into the script engine
is causing problems. Enabling this feature passes the collision into the
script engine on a separate thread and not the main simulation thread.
Tester can enable this and see if the collsions stay around. If they still
fail, this commit should be reverted and another solution looked for.
2015-08-02 22:31:53 -07:00
bccf785665
osKey2Name returns now correct values for HG users who are not on the region.
...
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-08-02 09:17:50 +01:00
e5a1243abc
Mantis #7657 and #7514 . This should alleviate the problem of bad object assets being passed around via HG and archives. No guarantees that all the leaks have been found, but at least it detects and fixes these bad assets upon:
...
(1) storing and getting assets over HG -- assuming the core HG asset service is being used (not the case with OSGrid!)
(2) importing assets via OAR and IAR
Instantiation of bad assets now should also work, instead of producing an exception, but the bad assets themselves aren't being fixed in the DB. That should be done with a cleaning tool -- see Perl script in Mantis #7657 .
Virus!
2015-08-01 18:58:05 -07:00
14b4d8bad7
Eliminated several warnings
2015-07-31 18:13:39 +03:00
149cb8dcbc
XMLRPCModule now actually aborts the worker thread when requested
2015-07-31 18:13:23 +03:00
e979a7e7f0
Fixed bad log message
...
This fixes http://opensimulator.org/mantis/view.php?id=7661
2015-07-31 17:55:09 +03:00
8aa75f225b
Fixed bug introduced in 4735514. The project didn't compile.
2015-07-26 14:09:17 +03:00
4735514a88
Fixed not being charged to create classifeids on money enabled regions
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-07-26 02:31:31 +02:00
83da582261
Removed unused code related to DNS lookups
2015-07-23 14:50:50 +03:00
3a2d4c8b05
Added logging in places where regions are searched for by their location
...
This commit also fixes the log message "Region already exists in coordinates <{0},{1}>": it was actually showing the *requested* coordinates, instead of the coordinates of the previously-existing link.
2015-07-22 20:13:53 +03:00
8cc7433d68
BulletSim: fix cut-and-paste typo in constraint frame setting.
...
This code is in the XNA module so it does not affect the normal
Bullet configuration .
2015-07-21 20:11:59 -07:00
297d31b1c2
Prevent two maptiles being generated at startup, one for v1 and another for v2-3 service. * v1 Service (WorldMapModule) is called directly by scene on startup. This patch moves the initial map registration of the v2-3 service (MapImageServiceModule) to that point so they can share the bitmap instead of doubling the work of Warp3D and exasperate its memory leak issues.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-07-21 15:11:47 -04:00
e174dc87fb
Fixed the whitespace in Scene.cs
...
The whitespace in this file was fubared recently
2015-07-13 12:37:18 +03:00
d750647fb1
BulletSim: fix two compiler warnings.
...
Mostly code left over from things that are not done that way anymore.
2015-06-25 22:02:12 -07:00
a91f32e2c7
Guard against null AgentPrefs service in llGetAgentLanguage()
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-21 08:41:37 -07:00
7edaf1d851
Add MaxMaterialsPerTransaction to SimFeatures
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-19 08:44:34 -07:00
c37315da87
Warp3DImageModule. Reduce workload by not calling to render the root prim twice. When loading prims to draw the map, the Warp3D system first calls to load the root prim, followed by all the prims in the SOG. The initial call to load the root prim is not required because it is also in the parts list. The result of this was that all root prims were being loaded twice.
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-19 06:56:19 -07:00
017d2cf417
Bug fix in inventory fetching: sometimes the caps request comes before there is a scene presence, and that's ok.
2015-06-17 15:55:07 -07:00
f27ce66877
Squooshed a warning that could result in a runtime null pointer exception. It says that code is for debugging, but it was buggy.
2015-06-14 08:18:21 -07:00
03f142730c
Squoosh one more warning
2015-06-14 08:14:09 -07:00
3853904b80
Quell three new warnings I introduced with AgentPrefsData, return an empty llsd map instead of an empty llsd block when no AgentPrefs service is available to try and appease Firestorm
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-14 07:59:25 -07:00
75baf6ce01
Added ':' to debug messages
2015-06-13 14:34:28 -07:00
d6dc782d75
Add optional GodNames region module
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 14:31:49 -07:00
044654b5a9
Guard against scenes without an agent prefs service and a copy and paste fix
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 13:37:08 -07:00
7f1a73cbda
Fixed indentation
2015-06-13 10:27:48 -07:00
bcb8a7d7f9
A few bug fixes for Agent Preferences to actually work. Also added missing config for standalone.
2015-06-13 08:36:06 -07:00
0fa94f222d
Refactor AgentPreferences so that database operations happen centrally. the opensim way.
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 07:27:42 -07:00
c1ddb7f05e
Relicense AgentPreferences files to BSD and OpenSimulator
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 07:27:26 -07:00
6f71d5c2c6
Support for Linden AgentPreferences capability and friends (UpdateAgentLanguage and UpdateAgentInformation) and Mantis #7157
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 07:27:01 -07:00
7aa171e49f
Maybe reduce incidence of ghost avatars
2015-06-12 03:16:09 +02:00
58972f65ac
SceneObjectPart.UpdateLookAt() now uses corrected libomv quaternion functions.
2015-06-10 01:26:38 -07:00
81ef7b586e
Address Mantis 7592 ( http://opensimulator.org/mantis/view.php?id=7592 ) by
...
disabling terrain patch sending by view distance for legacy sized regions.
The problem seems to be that people expect adjacent legacy sized regions
to just display like they always have. Limiting displayed terrain is
complicated by the camera position not being updated in child regions.
2015-06-06 07:09:20 -07:00
0c5facbd75
Typo Fix
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-05 16:48:16 -07:00
96f0c6f074
More on mantis #7567 . Two things:
...
- Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing
- Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time
2015-06-05 10:07:50 -07:00
cc22d81b4d
The only purpose of this commit is to remove an erroneous comment. It turns out that rezzing the attachments is necessary in modern viewers too. Proof: commenting the lines below the comment results in no attachments seen in the avatar.
2015-06-05 09:47:36 -07:00
83267e19f6
Mantis #7536 . This may alleviate the side effects of broken SceneObjects XML. It doesn't (can't) fix the cause.
2015-06-04 16:17:45 -07:00
bac53387a9
Mantis #7567 : added an 8-sec expiring item cache to the inventory network connector. This fixed the problem on my local test grid and generally made things faster. This cache has been needed for a while... there are many parts in the code where the sim gets an item multiple times in a short amount of time (rezzing attachs and objects, for example).
...
Other minor changes:
- added the scene as a parameter to the constructor od FetchInvDescHandler, so that I could see in which scene the handler was being called
- brought linked items in linked folders back to being prefetched
2015-06-03 17:42:41 -07:00
dcf31ee762
Correct constant RCERR_CAST_TIME_EXCEEDED.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-06-01 13:09:05 -04:00
5d3c327e93
Add a new os function "osGetGender()"
2015-05-29 23:02:12 -07:00
0af17c9484
llListRandomize() wasn't very random
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-05-27 11:15:09 -07:00
5e09e52ee9
Attachments Module. Fix detach event not being fired until the next time the object is attached.
...
Not an ideal fix but this allows scripts such as AOs to remove animations when detached etc. The pause added does not affect other avatars or the scene in general and only pauses the avatar performing the detach for an extra 2 milliseconds.
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-05-26 15:05:32 -07:00
9766dc1f81
Add WhiteCore's LL Json functions
2015-05-26 21:05:59 +02:00
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
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
7d26815d0e
Throttle llCastRay V3.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-22 01:21:18 -04:00
edcba95ab5
Merge branch 'master' into moses
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2015-05-20 23:40:52 +02:00
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
946a6622fe
Removing duplicate definition
2015-05-19 15:52:13 -04:00
140ea04b9d
Merging Opensim upstream before generating patch
2015-05-19 15:18:45 -04:00
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
6a48c87cd2
resolve possible nullref when sending appearance packet. Thanks to zadark for pointing this out.
2015-05-13 15:59:58 -07:00
3c2886cd75
Adding back command to clear region's user cache
2015-05-13 14:31:28 -05:00
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
d348f87161
Patch llCastRay fully simplified to V3.
2015-05-12 15:40:42 -07:00
3c596e47c6
Knocked off a few compiler warnings regarding unused variables.
2015-05-10 21:54:24 -07:00
f20728fc86
Constrain 'terrain modify' to selected Region
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-09 15:25:33 -04:00
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
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
dc4c9b1bb0
Minor whitespace removal
2015-05-07 14:09:29 -04:00
a9dd3028b9
Add 'terrain modify noise' and code cleanup
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-07 14:07:50 -04:00
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
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
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
44b8b9fef6
Revert "Patch llCastRay fully-simplified to V2." for further review.
...
This reverts commit c96ee68953
2015-05-04 16:23:16 -04:00
dfb73c1464
fix a minor whitespace issue
2015-05-04 15:56:12 -04:00
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
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
5a2440dfdf
Implement llGetGeometricCenter correctly.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-04 13:14:09 -04:00
c96ee68953
Patch llCastRay fully-simplified to V2.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-04 12:44:58 -04:00
43b8bd0c35
Implement llCastRay fully, simplified.
2015-05-03 23:41:11 -07:00
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
73efb1633f
lock collision mesh cache when accessing
2015-05-03 19:54:03 -07:00
60e719286b
Make Meshmerizer mesh cache static so it can be shared across class instances
2015-05-03 17:05:48 -07:00
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
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
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
da32512ea4
Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*")
2015-04-29 18:47:17 -07:00
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
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
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
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
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
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
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
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
c3138f9f38
Phase 2 additons with Frame Dilation metric.
2015-04-21 16:15:48 -04:00
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
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
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
263db44129
Implement llGetBoundingBox fully.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-20 16:23:34 -04:00
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
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
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
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
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
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
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
bdb91d0e70
Fix llTargetOmega non-physical gain.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-12 14:55:44 -04:00
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
8d66284841
BulletSim: implement VEHICLE_REFERENCE_FRAME. Thanks Vegaslon!.
2015-04-05 20:20:37 -07:00
c0ad5ee81d
varregion: update MapImageServiceModule to upload multiple map tiles for large regions.
2015-03-29 17:21:19 -07:00
6081ae3554
varregion: update MapImageModule and ShadedMapTimeRenderer for variable sized regions.
2015-03-29 16:55:18 -07:00
df14b40e88
varregion: update LandManagementModule and LandObject for variable sized regions.
2015-03-29 16:45:00 -07:00
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
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
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
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
d74d74c910
varregion: restore checkAgentAccessToRegion routine in EntityTransferModule.
2015-03-27 06:47:55 -07:00
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
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
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
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
97ff01a0c2
Taking a reference to the value collection is not thread safe. Change this
...
to create a shallow copy instead and then iterate it's values to avoid the
"out of sync" error.
2015-03-23 22:15:25 +01:00
9f18e3ba80
Varregion: first cut at removing Border class checks for region crossings.
...
Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work.
Many changes made to EntityTransferModule to accomodate new crossing sense logic.
2015-03-22 21:53:02 -07:00
b51e46ceb8
Parameterize sleeps in LSL functions.
2015-03-22 09:55:02 -07:00
07a75677c3
Allow setting hollow to 99% from scripts just like from viewer.
2015-03-22 09:53:27 -07:00
f63d6ffd81
Allow setting holesize to 0.01 from scripts just like from viewer.
2015-03-22 09:53:13 -07:00
68ed200191
Allow setting dimple diff to 0.02 from scripts just like from viewer, add clipping and fix old copy-paste error.
2015-03-22 09:53:03 -07:00
5af82df9b6
viewers can set a minimum distance 0.02 between path cut start and path cut end
2015-03-22 09:52:46 -07:00
83e58ebc7c
oops someone set individual quaternion members and forgot to normalize
2015-03-17 13:14:03 -07:00
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 30b7863http://opensimulator.org/mantis/view.php?id=6835
2015-03-17 18:55:33 +00:00
45dd0cc363
Actually start a region created via the "create region" console command.
...
Addresses http://opensimulator.org/mantis/view.php?id=7478
2015-03-13 23:50:00 +00:00
0aeea89258
Fix script state not being preserved in objects sent via Hypergrid.
...
This was because attributes were not being included in the transformation, hence losing the script state identity.
Symptoms are messages like "[SCENE OBJECT GROUP]: SavedScriptState element had no UUID in object test box"
Regression since the conference code merge. Regression test extended for this case.
Relates to http://opensimulator.org/mantis/view.php?id=7439
2015-03-13 20:09:29 +00:00
3a7d42378f
Move state change in progress in ScriptInstance.PostEvent() to the top of the EventQueue lock to avoid some flags possibly being wrongly set (m_LastControlLevel, etc.)
2015-03-12 00:14:30 +00:00
7410924de0
Lock around EventQueue manipulation in ScriptInstance.SetState() as queues are not thread-safe structures.
...
This should also make it less likely that an event will be erroneously posted during a state change by precluding a race condition with a thread calling ScriptInstance.PostEvent()
2015-03-12 00:07:01 +00:00
b4b13510e8
A workaround for the state change problem described best here http://opensimulator.org/mantis/view.php?id=6960 which should make state changes behave more like is described here http://wiki.secondlife.com/wiki/State
2015-03-12 00:01:30 +00:00
78258a0fa1
help restart message corrected
...
The "restart" console command restarts the currently selected region or
all regions in this instance if root is selected. Changed the message
accordingly.
2015-03-11 23:30:05 +00:00
b267c238fb
minor: Remove windows build warning about CompressionLevel package ambiguity.
...
Relates to http://opensimulator.org/mantis/view.php?id=7442
Thanks Fly-Man-
2015-03-11 22:53:32 +00:00
b5ac2eb1e1
Allow setting the size of the wearables array from config, for core compatibility
2015-03-10 01:04:04 +01:00
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
f6168ded47
Remove references to MAX_ASSET_DESC from the dynamic texture module, hardcode to 128 as in other inventory modules.
2015-03-06 21:10:45 -05:00
4de10a45e9
revised GetMesh to not use intermediate base64 coding scheme
...
it delivers binary and has binary as input.
base64 intermediate coding makes no sense.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-05 18:15:42 -05:00
5a413c1b2f
adjusted new UserManagementModule to accept the HG UUI test harness
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-05 17:19:39 -05:00
375f8cce34
Give llGiveInventory a way to querry Hypergrid visitors so network vendors are able to give items to Hg visitors
2015-03-05 16:58:02 -05:00
0ea6977013
solving HG IM, HGFriends issues based on falsified GridUser data
...
it does not consider GridUser as a viable source for residents' data.
it does not consider Friends, Inventory Creators to be trusted at all. There are lots of broken entries in existence.
There are lots of broken creator data fields in assets.
The following issues arise from the broken data in the old User Management Module:
failing HG IM
failing HGFriends Requests
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-05 16:17:12 -05:00
08637727dc
Merge branch 'master' of /team/src/opensim
2015-03-04 14:58:08 -05:00
96b87407f1
Revert "removed replacement texture in UDP Texture code. The replacement texture introduces false data into viewer cache. Removing that decreases the necessity for clearing the viewer cache. The viewer knows with ImageNotInDatabase that it is missing and can therefore know what to do about it a lot better than the sim does."
...
This reverts commit 4d749d8c69
2015-03-04 14:36:26 -05:00
7d3bafd5ab
Add outbound URL filter to llHttpRequest() and osSetDynamicTextureURL*() script functions.
...
This is to address an issue where HTTP script functions could make calls to localhost and other endpoints inside the simulator's LAN.
By default, calls to all private addresses are now blocked as per http://en.wikipedia.org/wiki/Reserved_IP_addresses
If you require exceptions to this, configure [Network] OutboundDisallowForUserScriptsExcept in OpenSim.ini
2015-03-04 18:27:50 +00:00
2d8c1806ca
usability fixes for LSL API
...
exception based error messages were cryptic for casual users
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-04 12:45:37 -05:00
eacdad8405
simplify llStringToBase64 and llBase64ToString
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-04 12:41:49 -05:00
061dd3385c
usability fixes for LightShare API
...
exception based error messages were cryptic for casual users
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-04 12:36:02 -05:00
53100b93c7
corrected bug that viewer cannot correctly fetch ItemData when being a HG visitor
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 19:09:30 -05:00
773df94665
corrected osMakeNotecard(string data) text length was calculated wrong. The Linden text format defines a byte count in that format.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 19:06:52 -05:00
fb48ee1cb6
corrected script notecard parser. It now handles notecards with inventory as well.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 18:39:49 -05:00
c02636b6f3
Revert "corrected osMakeNotecard(string data) text length was calculated wrong. The Linden text format defines a byte count in that format."
...
This reverts commit b519a5e62a
2015-03-03 17:42:02 -05:00
b6b1e11238
Pickup our version number for the function
2015-03-03 16:42:42 -05:00
7f0995ae31
added llGetEnv() implementation
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:39:00 -05:00
b519a5e62a
corrected osMakeNotecard(string data) text length was calculated wrong. The Linden text format defines a byte count in that format.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:10:09 -05:00
4d749d8c69
removed replacement texture in UDP Texture code. The replacement texture introduces false data into viewer cache. Removing that decreases the necessity for clearing the viewer cache. The viewer knows with ImageNotInDatabase that it is missing and can therefore know what to do about it a lot better than the sim does.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:09:57 -05:00
0f72773017
changed llGetMemoryLimit to return 65536 as for Mono LSL
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:09:49 -05:00
af2bf397b1
corrected memory info for scripts
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:09:41 -05:00
25901a703a
corrected llGetStartParameter according to http://wiki.secondlife.com/wiki/LlGetStartParameter
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 15:35:23 -05:00
b8157174ca
corrected llResetScript according to description within LSL wiki
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 15:35:00 -05:00
c6731c73fb
increased IPv4 TTL of LLUDP Sockets
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 15:34:34 -05:00
7e8bad05ec
Fix erratic Npc movement
2015-03-02 20:09:22 -05:00
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
cfa4e6642e
Handle kick user from estate management tools
2015-03-01 20:48:51 -05:00
158c3f82f1
Correct PRIM_TEXT return value from trans to alpha.
2015-02-28 00:46:12 +00:00
4717132b82
Use using constructs on disposable io objects in LLRaw to ensure they are always closed even if an exception is thrown.
2015-02-28 00:41:11 +00:00
3c92a8e765
Add OpenSim.Framework using statement necessary to get previous fad4d4dc to compile.
2015-02-28 00:34:07 +00:00
fad4d4dc55
Permit loading of LLRAW files bigger than 256x256 by calculating size based on file size rather than assuming 256x256, same as for RAW32.
2015-02-28 00:26:58 +00:00
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
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
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
aeb8a4bf85
Revert "Adding dynamic ossl permission control"
...
This reverts commit a3681f3052
2015-02-27 12:27:10 -05:00
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
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
5fa651c529
minor: In HGAssetMapper, don't complain on seeing an XmlDeclaration as we know that we not using those in transformation.
...
Relates to http://opensimulator.org/mantis/view.php?id=7447
2015-02-25 21:42:07 +00:00
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
2015-02-25 21:12:46 +00:00
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
8333dcf388
llLookAt(): use non-physical rotation if host prim is a physical attachment
2015-02-24 17:16:30 -08:00
023fd71ce5
Fix cross-grid inventory delivery notifications, fixes http://opensimulator.org/mantis/view.php?id=7113
2015-02-21 14:29:31 -05:00
c67b3407d4
In HGAssetMapper.RewriteSOP(), don't explicitly end the document.
...
The document here has no <?xml declaration. Though ideally it may be present, in practice it has not been added as the data here is embedded within an asset
On Mono 3.2.8 and probably other versions, calling WriteEndDocument() without a declaration does nothing.
On Windows .NET, the same operation throws a "Document does not have a root element" exception which may be contributing to Mantis 7397 and possibly 7439
2015-02-21 00:08:49 +00:00
c90c22ed28
If HGAssetMapper.PostAsset fails then be more explicit about the uuid, type, size and base asset uuid of the failure for debugging purposes.
2015-02-19 23:50:25 +00:00
7a86b01226
Make any exception that gets to LLClientView.ProcessSpecificPacketAsync() tells us the exception type as well as the message and stacktrace details.
2015-02-19 23:09:43 +00:00
264047dba0
Add the type of the unrecognized node to the HG asset mapping error message in TransformXml()
2015-02-19 22:39:22 +00:00
e4f0cdd263
Comment out unnecessary "Region Found!" alert message when searching map
2015-02-18 12:52:16 -08:00
8b2af1071f
Add NaN and Infinity tests for SOP Velocity and Acceleration setters.
2015-02-16 23:51:37 -08:00
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
2700b096bc
Filter NaN and Infinity values at SOP AngularVelocity setter
2015-02-16 19:06:01 -08:00
99668a63e4
fix axis locking Amotor
2015-02-13 13:37:12 +00:00
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
53b23a9adc
Somewhat naive implementation of RotationalVelocity setter for ODE. Enables llSetRotationalVelocity(), llTargetOmega(), llLookAt(), and probably a few more LSL features for physical objects in ODE.
2015-02-07 22:52:12 -08:00
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
2ed1afd32b
llLookAt(): reduce and clamp strengh to reduce probability of overshoot
2015-02-07 14:17:37 -08:00
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
3b7c3378f1
Manage Angular Velocity during llLookAt() rotation of physical objects
2015-02-05 23:13:06 -08:00
ee810a2cb5
Set angular velocity in physics actor in SceneObjectPart.AngularVelocity setter. Enables llSetAngularVelocity()
2015-02-05 14:29:51 -08:00
95a0f0d47b
replace accidently deleted line from last commit
2015-02-05 13:44:39 -08:00
bde7b2a7b5
Allow MaterialsModule to be enabled by default if [Materials] is absent from OpenSim.ini
2015-02-05 13:17:31 -08:00
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
39754b2dca
correct some minor comment misspellings in last commit
2015-02-02 04:03:04 -08:00
1eedc2b4af
Compute rotation for llLookAt() with local positive X axis pointing down
2015-02-02 02:47:47 -08:00
bee3933e57
Prevent null entries being treated as URI's when DataSnapshot service splits service string. The new config format for services to notify in the DataSnapshot module appends entries to the existing single string and always leaves a deliminator on the end of the string. This is causing it to split with a null string in the resulting array, which is treated as another service to notify and throws a URI format exception on start up.
2015-02-01 10:29:47 -08:00
557b0fae85
minor: correct log message when script with non-config stop strategy is detected to log actual strategy rather than true/false
2015-01-29 18:28:17 +00:00
b4e955d1c1
Avoid a possible race condition by serializing plugin data outside the EventQueue lock in ScriptInstance.SaveState()
...
This takes the AsyncCommandHandler.staticLock.
However, AsyncCommandHandler.DoOneCmdHandlerPass() already holds staticLock and may attempt to take the EventQueue lock via ScriptInstance.PostEvent() in XEngine.CheckListeners()
This is a regression from faaf47a
2015-01-29 17:55:08 +00:00
cf0087e87c
Correct typo in raw default script stop strategy
2015-01-27 21:04:11 +00:00
e0a3440263
If [XEngine] ScriptStopStrategy is different from a compiled script strategy, ask user to manually set DeleteScriptsOnStartup = true for at least one simuator session rather than auto-recompiling.
...
This does not work on Windows since the VM retains a handle to the DLL even if class instantiation was unsuccessful.
Which causes deletion of the old DLL to fail with access sharing violations.
Instead, log a warning in this situation asking the user to manually set DeleteScriptsOnStartup = true for a session (or one could separately delete the DLLs in the relevant bin/scriptengines/<region-uuid> dir
For the current session, the script engine will continue using the script compiled stop strategy as before.
Relates to http://opensimulator.org/mantis/view.php?id=7278
2015-01-27 19:07:20 +00:00
13ba2f2d83
If an exception comes out of DoOnRezScript in DoOnRezScriptQueue(), then only fail a single script rather than halting the exntire script startup process.
2015-01-26 23:32:51 +00:00
1bed3aff0b
On a multi-region simulator when AppDomain = true, make sure the DLL from the appropriate script engines subdir is loaded rather than always that of the first engine to load the DLL.
...
This resolves a DLL load failure on my Linux box when an attachment script was present on another region before the avatar arrived.
2015-01-26 23:31:46 +00:00
de76116624
BulletSim: add parameters and parameter definitions for VHACD
...
addition coming.
2015-01-25 13:24:09 -08:00
840e440541
When deleting an assembly before re-compile, make sure its attributes allow deletion.
...
This is to see if this helps with the problem in http://opensimulator.org/mantis/view.php?id=7278 where some DLLs are not allowing this.
Since OpenSim created the file it should always be allowed to delete it.
2015-01-23 00:45:51 +00:00
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 f132f642http://opensimulator.org/mantis/view.php?id=7278
2015-01-23 00:27:57 +00:00
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
155da5aad2
Add debug ability to ignore reliably sent packets that are not acknowledged.
...
This is controlled via the console command "debug lludp client set process-unacked-sends true [<avatar-first-name> <avatar-last-name>]"
For debug purposes to see if this process for very bad connections is causing general outbound udp processing delays.
Relates to http://opensimulator.org/mantis/view.php?id=7393
2015-01-21 20:31:42 +00:00
372a7bf78e
minor: Comment out log line for the SimulatorFeatures cap request for now to reduce log verbiage. Please revert if still required.
2015-01-21 00:34:51 +00:00
25dd30ddb6
minor: Fix some CR line endings in Scene.Inventory.cs
2015-01-21 00:33:54 +00:00
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 13f31fdhttp://opensimulator.org/mantis/view.php?id=7399
2015-01-21 00:21:27 +00:00
ac93ba9f85
minor: correct SceneCommunicationService.LogHeader spelling
...
Relates to http://opensimulator.org/mantis/view.php?id=7337
2015-01-20 00:19:33 +00:00
1f04e1bc23
minor: In AttachmentsModule.UpdateKnownItem use the existing IInventoryAccessModule reference that other methods are already using rather than fetching its own copy.
2015-01-17 00:08:16 +00:00
2995868176
Make XEngine.SaveAllState() actually do this instead of script maintenance
2015-01-17 00:05:13 +00:00
0eb268e265
minor: remove old commented out objectRemoved bool in XEngine.OnRemoveScript()
2015-01-16 23:59:08 +00:00
58f7efc41a
Add clearqueue code adjustment that should have been in previous commit faaf47a
2015-01-16 23:57:51 +00:00
faaf47a86f
Prevent a race condition between the script engine backup thread and script removal by locking on the script's EventQueue and only proceeding if it's flagged as still running.
...
Relates to http://opensimulator.org/mantis/view.php?id=7407
2015-01-16 23:55:11 +00:00
8d724e90de
For scripts in attachments, don't save .state files apart from the initial one as these are ignored since .state is saved in the attachment's asset.
...
This eliminates pointless work and exceptions when an appdomain is unloaded whilst an attachment script state is persisted.
Adds test for this case.
Relates to http://opensimulator.org/mantis/view.php?id=7407
2015-01-16 22:46:48 +00:00
97ac80d664
minor: Suppress the log messages when user profiles data is requested for an NPC or an HG user with no set server URI to avoid log spam.
...
Messages concerning failure to contact a given user profiles service are preserved by logging within called code with the agent ID.
If the "No Presence - foreign friend" log message is important then please revert.
Relates to http://opensimulator.org/mantis/view.php?id=7414
2015-01-16 00:54:32 +00:00
b22c072c40
Fix a recent regression with HG asset posting to other grids where the assets were no longer being posted.
...
Addresses regression from 08606ae
2015-01-15 23:44:34 +00:00
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
8cc590cf80
And finally renamed the classes themselves.
2015-01-13 22:21:50 -08:00
55e081548c
Fix bug where gathering the clientstack..OutgoingPacketsQueuedCount stat would fail with a casting exception for scenes with NPCs
...
Present since 51eb8fa
2015-01-13 19:27:29 +00:00
8e1e8a0920
Make the performance controlling job processing threads introduced in conference code use a generic JobEngine class rather than 4 slightly different copy/pasted versions.
2015-01-12 20:56:37 +00:00
2fd252f5a9
SimulatorFeatures: the viewer also takes GridName in OpenSim extras. Added that (plus GridURL, in case viewers want to use it too) to the GridService that gives out that info to simulators.
2015-01-10 10:32:33 -08:00
20b34135cb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-01-09 08:32:40 -08:00
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
dbd500db42
minor: Add event name to existing debug output when a script event fails with an exception. To aid debugging.
2015-01-08 22:59:29 +00:00
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
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
14b3ee636d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-01-07 11:09:04 -08:00
46ab59723d
Added a different/better way of specifying data services in DataSnapshot -- using DATA_SRV_ keys, one per service. This allows 3rd party modules to add data services automatically.
2015-01-07 11:04:23 -08:00
6e2b532255
BulletSim: fix line ending problems.
2015-01-07 06:46:08 -08:00
4959dbba5e
BulletSim: make computation of hole cut in hull tester explicit
...
math showing the odd PrimitiveBaseShape value rather than a constant.
2015-01-07 06:42:41 -08:00
700543b161
BulletSim: tweek step parameters and logic to make walking up steps
...
closer to SL. This change should address small floor edges acting like
walls, approaching a step at any angle (other than walking backwards)
will allow walking up, and reducing the avatar pop-up when going up
stairs.
2015-01-07 06:39:29 -08:00
103aad27f2
BulletSim: comment out the reference to BSShapeHull in BulletSim tests
...
which seems to cause the tests to fail when compiled on the OpenSim
build system. It compiles and runs everywhere else. More research is needed.
2015-01-04 14:26:50 -08:00
a617159f8b
BulletSim: correct some of the debugging input and output of PrimitiveBaseShape.
...
Whoever defined that structure was really into esoteric coding.
2015-01-04 13:52:14 -08:00
b379eaa169
Remove the extra key expansion added in commit a88bc50a16. It's not needed.
2015-01-03 07:56:00 -08:00
2496da2dac
BulletSim: remove compile reference error trying to figure out why mono compiling doesn't like it
2014-12-31 13:45:12 -08:00
c89d0e26b2
BulletSim: add the beginnings of hull creation unit testing.
...
Change how physics engine is created in unit tests to resolve a lib reference problem.
Add ShapeInfoInfo class to collect info about the created physical shape
for debugging and unit test testing.
2014-12-31 12:48:26 -08:00
291c7cdbcc
BulletSim: Add axis locking enabled through the ExtendedPhysics module.
...
Allows locking of prim/linkset relative moving in each of the linear
and angular axis. Limits on movement or rotation can be set.
2014-12-31 12:43:26 -08:00
b40935837c
Fixed declaration switcharoo on the region combiner dll.
2014-12-31 08:20:17 -08:00
3375841fee
Capitalization fail.
2014-12-30 23:47:11 -08:00
0af02efaed
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-12-30 20:05:33 -08:00
a88bc50a16
Add support for expansion of key values in nini config files.
...
Add loading of 3rd-party addin inis automatically.
2014-12-30 20:05:12 -08:00
bc7570e59c
Merge branch 'mb-throttle-test'
...
Merge in the new throttle code.
2014-12-30 16:26:57 -08:00
2138d5c7f8
Renamed VERSION_NUMBER to VersionNumber
2014-12-30 15:27:28 -08:00
5bb73793c7
Comment out the debugging statements added in the last commit. Keeping
...
them in the code for later use rather than just reverting them.
Fixed the throttle tests for the new algorithm used when packets
are marked as expired.
2014-12-30 14:43:42 -08:00
7466ef0525
This cleans up versioning. Specifically:
...
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions
It also eliminates the last addin.xml files that were still there, for consistency.
2014-12-30 12:53:31 -08:00
58229a968b
Turn on logging of old acks, this is for debugging only, stats version coming later
2014-12-30 10:50:34 -08:00
c06100c31f
Another technique inspired by some of the newer flow control algorithms... rather
...
than drop exponentially to 0 (and then adjust up for the minimum flow), drop on
the delta between current rate and the minimum rate. This should smooth the fallback
to minimum.
2014-12-30 10:39:14 -08:00
75df04f0b3
Fix the throttle tests. Remove the hardcoded constant multipliers and
...
compute the expected values without depending on the token bucket code.
2014-12-30 10:03:37 -08:00
2506728e35
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-12-30 07:59:09 -08:00
5cf6a6f830
WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT.
...
This cleans up Opensim's use of mono addins. In particular, the extension points /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to OpenSim.Region.Framework.dll. From here on, developers of region modules should declare their dlls to be dependent on OpenSim.Region.Framework, starting with version 0.8.1
Additional changes:
- Addins version uniformly updated to 0.8.1. These numbers should be compatible with the release numbers or else it becomes very confusing.
- Mono addins directives moved from files addins.xml to embedded directives in the class and assembly declarations, to make it all consistent
2014-12-30 07:58:42 -08:00
bda8f2a2c1
Change the effect of successfully acknowledged packets to bump the
...
adaptive throttle by a full MTU. This is consistent with some implementations
of congestion control algorithms and certainly has the effect of opening
the throttle window more quickly after errors. This is especially important
after initial scene load when the number and size of packets is small.
2014-12-29 23:19:10 -08:00
041a09ecb9
Enable runtime configuration of the minimum rate for adaptive
...
throttles. Setting adaptive_throttle_min_bps will change the
minimum rate that the adapative throttles will drop to in case
of network packet loss. The current rate default rate is 256kbps.
The viewer can throttle rates under that amount, but the dynamic
adaptation will not.
2014-12-29 18:46:33 -08:00
5410e4f1f9
minor: correct sent -> set in TokenBucket.RequestedDripRate method doc
2014-12-30 00:53:17 +00:00
89c1ac4cff
Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number doesn't need to match the release version number, but I think it's a very good idea that they do.
2014-12-29 15:05:44 -08:00
601849b4fa
Added AssemblyInfo.cs to OpenSim.exe
2014-12-29 14:13:17 -08:00
e71549a2cb
Add debugging code for simulating packet loss in outgoing UDP packets. The
...
algorithm for dropping packets is a modified two state algorithm for creating
bursts of dropped packets. As configured there is about a 1.5% drop rate.
Invocation of the packet loss code is commented out by default.
2014-12-29 12:02:36 -08:00
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
fc940ab09a
If a moap entry has EnableWhiteList but WhiteList == null, then properly block the request instead of throwing an exception.
...
Normally, WhiteList is an empty list but from Mantis 7389 it looks like it might sometimes be possible for it to be null (haven't seen this up till now)
It looks like failing with an exception instead of properly replying to the request (which comes in via a cap) might be enough, surprisingly, to freeze a viewer until timeout.
Part of http://opensimulator.org/mantis/view.php?id=7389 but probably unrelated to the actual issue of that mantis.
2014-12-23 20:38:20 +00:00
9cff0bbd7c
In XBakesModule.Get() use using() to always dispose of RestClient which disposes the stream rather than disposing the stream directly
2014-12-20 01:46:32 +00:00
798074c66f
Use using() semantics in XBakesModule to ensure disposable objects are alway disposed no matter what
2014-12-20 01:38:48 +00:00
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
e50aac020f
Add command to reset region's user cache
2014-12-16 12:47:02 -05:00
147d401b28
Remove XEngine.m_uniqueScripts
...
This provides no obvious benefit as far as I can tell but has a definite cost in keep script strings in memory for the entire simulator session.
2014-12-15 20:38:26 +00:00
2b9f0647de
Fix a regression where objects crossing regions in the same simulator (on their own or as attachments) with AppDomainLoading = false would create the new state in the source region area rather than the dest.
...
This was beause the code was finding the script DLL compiled for the source region as everything is in the same appdomain and using this as the location for the destination script state, etc.
This resolves the regression by passing the proper destination separately from the DLL retrieved.
Probably a regression since commit d7b92604http://opensimulator.org/mantis/view.php?id=7278
2014-12-10 00:25:27 +00:00
227d2e2b61
Avoid a possible race condition where the XEngine script compile thread could complete but see OnRezScript() insert a new job and complete before it set m_CurrentCompile = null
...
If the above happened, it would mean the new script would not compile until some script was added for compilation.
2014-12-10 00:04:10 +00:00
76722d8324
In XEngine, enqueue a script rez to the compile queue after setting m_CompileDict to avoid a rare but not impossible race condition.
2014-12-09 23:59:19 +00:00
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
b0ff3236be
Make "fache assets" console command more efficient by only updating access times on each cached asset once, not for every reference.
2014-12-05 00:09:01 +00:00
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
bee3f203cd
Allow scripts in attachments on an owned NPC to call NPC functions on that NPC
2014-12-04 22:52:46 +00:00
9dbe99af0f
If "fcache assets" is executed, don't stop with an exception if there's an access violation if another thread is operating on the file at the same time.
...
Resolves one issue from http://opensimulator.org/mantis/view.php?id=7271
2014-12-04 01:53:42 +00:00
ad91143880
refactor: breakout flotasm cache last file access time to separate UpdateFileLastAccessTime() method for imminent reuse.
2014-12-04 01:51:01 +00:00
c36bfdc60f
Don't worry about checking FlotsamAssetCache.m_CurrentlyWriting when updating access time.
...
The majority of updates won't be for anything currently writing and any sharing exception from an actual clash can be caught and ignored anyway.
2014-12-04 01:46:00 +00:00
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
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
d34ad345d5
minor: If we are recompiling scripts in response to a ScriptStopStrategy config change (a rare situation), then explicitly log this for debug purposes.
2014-12-03 21:08:43 +00:00
c3c05a8693
Reintroduce general xengine extra debugging log level. This can be controlled at runtime with the command "debug xengine log <level>", as with similar commands.
...
If log level is 1 then every script load is logged.
This means the <logger name="OpenSim.Region.ScriptEngine.XEngine"> section in OpenSim.exe.config is no longer needed to avoid log spam on regions with many scripts and can be removed.
2014-12-03 20:48:17 +00:00
805b7ccb3e
minor: improve logged error in XEngine.SetXmlState if there was a problem writing the linemap.
...
The previous error report of already exists is inaccurate since existing files do get overwritten.
2014-12-03 20:35:49 +00:00
72d1d96c5c
Always close script linemap file after reading and always dispose of other streams in the script engine even if exceptions are thrown.
2014-12-03 20:31:09 +00:00
3642198838
BulletSim: move detail log of InternalScheduleRebuild to reduce log file spam
2014-11-30 19:53:00 -08:00
63d192f011
BulletSim: Remove linkset 'Incomplete' flag as its meaning couldn't be made clear. Add 'InternalScheduleRebuild() CHange rebuild code to call InternalScheduleRebuild() rather than ForceRebuild() to limit the scope of the changes made by the linkset.
2014-11-30 19:53:00 -08:00
41a943bfd0
BulletSim: add BSLinkset.AllPartsComplete that checks of all linkset members are not Incomplete and not waiting for assets. Change BSPrimLinkable to use AllPartsComplete.
2014-11-30 19:52:59 -08:00
eef954a214
BulletSim: Make BSPrimLinkable 'incomplete' if any of its children are waiting for assets to load.
2014-11-30 19:52:59 -08:00
cf85ade81e
BulletSim: add shape and linkset rebuild scheduled flags. Add BSPrim.Incomplete flag based on rebuild flags to say when an object is being rebuilt.
2014-11-30 19:52:58 -08:00
432f0e8783
Correct 690fe0c to actually log the exception reported in DoOnRezScriptQueue()(and now the scene name).
2014-11-29 15:04:16 +00:00
690fe0c5e5
If there are any exceptions in XEngine.DoOnRezScriptQueue() then log the error and always set m_CurrentCompile = null
...
Setting m_CurrentCompile = null in the finally block reduces the risk that an exception could permanently stop any future scripts compiling until the simulator is restarted.
If an exception is seen from this then please report and further changes to fix the bug or improve compiling reliability can be made.
2014-11-29 01:42:52 +00:00
55e064baf7
Remove minor race condition where two threads could race on fields such as m_ScriptFailCount as set in XEngine.DoOnRezScriptQueue()
2014-11-29 01:33:14 +00:00
79e37e5ecc
Restore zero'ing RawVelocity in BSCharacter.ZeroMotion() in favour of not calling ZeroMotion in SetPhysicalProperties() at all
...
SetPhysicalProperties is only called when adding a new character so it looks like there is no existing data to reset anyway.
2014-11-29 01:13:48 +00:00
dfab60a7fd
minor: Remove a few indenting problems introduced to recent 265fe349 and convert the m_log.DebugFormat() call back to the original DetailLog call
2014-11-29 00:53:13 +00:00
dcc36507f3
Halve the prediction lag for region crossing to improve most flying region crossings without degrading the walk cross experience (neither of which have been that great anyway).
2014-11-29 00:48:26 +00:00
39eab72d7c
When performing region cross, don't add the velocity to the new position in ETM.CrossAgentIntoNewRegionMain() since this has already been performed by SP.CheckForBorderCrossing()
2014-11-29 00:16:23 +00:00
265fe349e0
Somewhat improve avatar region crossings by properly preserving velocity when avatar enters the new region.
...
This commit addresses the following issues were causing velocity to be set to 0 on the new region, disrupting flight in particular
* Full avatar updates contained no velocity information, which does appear to have some effect in testing.
* BulletSim was always setting the velocity to 0 for the new BSCharacter. Now, physics engines take a velocity parameter when setting up characters so we can avoid this.
This patch applies to both Bullet and ODE.
2014-11-29 00:12:11 +00:00
09534f378e
Avoid repeated lag-generating continuous attempts to retrieve HG service Urls in UMM if the initial request fails, possibly due to the home URL not being present
...
Instead, the failure information is effectively added to the memory cache (so no persistence over simualtor sessions).
A future improvement may be to invalidate negative cache results after some time has passed in case the failure was transient.
Looks to resolve http://opensimulator.org/mantis/view.php?id=7382
2014-11-28 01:16:30 +00:00
3b6191de7f
Merge branch 'master' into ubitworkmaster
2014-11-28 00:00:16 +00:00
e8d67af3e1
change/fix rez position and rotation on llRezObject and llRezAtRoot
2014-11-27 23:32:24 +00:00
ee9fae23ff
Be more explicit again in UMM bad HomeURL message by logging the original creator data
2014-11-27 00:32:04 +00:00
8a27fc5d61
Make UMM.AddUser(UUID, string) log message when bad creatorData is given to reflect its location (UMM not Scene) and add the user name and ID.
2014-11-27 00:24:17 +00:00
86367d7219
refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class.
...
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
2014-11-25 23:56:32 +00:00
20cede12a9
Fix ghosts copy of SimulatorFeatureModule to enable logging.
2014-11-25 23:28:38 +00:00
66b1c37973
Fix bug in HG attachment throttling code where attachments were never rezzed on any teleport within a foreign grid after the first.
...
Bug was introduced in ghosts branch commit 69abade
2014-11-25 23:23:12 +00:00
b1fd0d35e5
Make small adjustment to JobEngine default from previous commit to enable it when [Startup] section is not present (though this is extremely unlikely).
2014-11-25 23:23:11 +00:00
59b38f842a
Add [Startup] JobEngineEnabled setting that allows the job engine to be disabled for testing purposes if necessary.
2014-11-25 23:23:11 +00:00
28d1dbfee4
Move conditionals which control whether a task is placed in the JobEngine inside Watchdog.RunJob() (renamed from RunWhenPossible) and generalize them.
2014-11-25 23:23:11 +00:00
124be38f74
Add [BulletSim] option AvatarToAvatarCollisionsByDefault to control whether avatars collide. This is true by default.
...
This is implemented with a new collision type (PhantomToOthersAvatar) to potentially allow colliding and non-colliding avatars to be present in the same scene.
So there is no provision yet for giving avatars different collision types.
This commit replaces the temporary change in commit f3eaa6d8
2014-11-25 23:23:11 +00:00
3a296a817b
Fix compile error from previous 1d56029848
2014-11-25 23:23:11 +00:00
550cf714bc
Fix issue where llRemoteLoadScriptPin() would treat 0 (the default) as a valid set pin in a destination prim rather than the unset no pin state
...
Adds regression test for this case.
2014-11-25 23:23:11 +00:00
aeae34505f
When processing incoming attachments via HG, if a request for uuid gathering or final asset import takes too long remove remaining requests from same user to prevent hold up of other user's incoming attachments.
...
This improves upon the earlier naive simply queueing immplementation.
Threshold is 30 seconds. If this happens to a user they can relog and fetch will be reattempted.
2014-11-25 23:23:11 +00:00
06a5d6e9ef
Introduce an IteratingUuidGatherer where each fetch from the asset service (iteration) can be controlled by the caller.
...
This is to enable an imminent change where incoming HG scene object fetching can assess the time taken by each request rather than being forced to perform all requests in one call.
Soon, this will replace the existing UuidGatherer since it is both simpler and more flexible.
2014-11-25 23:23:11 +00:00
d6c9705a3b
Add incoming packet async handling engine to queue some inbound udp async requests.
...
This is to reduce the potential for overload of the threadpool if there are many simultaneous requets in high concurrency situations.
Currently only applied to AvatarProperties and GenericMessage requests.
2014-11-25 23:23:11 +00:00
1c5c6af274
Add missing class from recent commit 69abade
2014-11-25 23:23:10 +00:00
f54c70741b
Add "show threadpool calls active" console debug command.
...
This shows named threadpool calls (excluding timer and network calls) that are currently queued or running.
Also shows total of labelled and any anonymous calls.
2014-11-25 23:23:10 +00:00
1d19e1bbd0
Add naive implementation of controlled incoming HG attachments to manage load.
...
Instead of processing all incoming attachment scene object concurrently, process them consecutively to eliminate potential overload from this source.
This is a naive implementation because it does not currently account for slow foreign asset services.
Although it may take longer, this approach may also improve attachment visibility for HG avatars
since the scene object is now always added to the scene after receiving assets from the foreign service and not before.
2014-11-25 23:23:10 +00:00
ec8d21c434
Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis.
...
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
2014-11-25 23:23:10 +00:00
8c9f82b035
Just for now, don't alert the user or log if we couldn't change their server-side preferences due to no e-mail address being sent.
...
This is to avoid user confusion in the oscc rehearsal as they are often not aware that this fails because no e-mail is set.
Also may be failing in the hypergrid case, though this may also be a config issue.
This is meant as a temporary solution.
2014-11-25 23:23:10 +00:00
5d5ea9234f
Stop Mono 3.2.8 from binding a UDP socket to a port already in use.
...
At least on Mono 3.2.8 (but not under Windows), one can bind multiple UDP sockets to the same port by default.
Different simulators cannot demultiplex each other's messages, so a set of confusing non-obvious errors arise if this occurs.
This change prevents such multiple binding.
2014-11-25 23:23:09 +00:00
3a1ce2715a
Add "wearables check" console command
...
This checks that all the wearable assets and any assets for a given logged in avatar exist in the asset service
2014-11-25 23:23:09 +00:00
9b09dd3575
Add "wearables show" console command.
...
This shows summary wearables information (shape, hair, etc.) for all avatars in the scene or specific information about a given avatar's wearables.
Similar to the existing "attachments show" command.
2014-11-25 23:23:09 +00:00
5ab5d7fe47
Fix recent regression where adaptive throttles stopped adjusting.
...
Extends regression tests to test response of adaptive throttles to ack'ed and expired packets.
2014-11-25 23:22:20 +00:00
b2e377f168
Fix setting of max scene throttle so that setting it restricts the child client throttles properly.
...
In "show throttles", also renames 'total' column to 'actual' to reflect that it is not necessarily the throttles requested for/by the client.
Also fills out 'target' in non-adapative mode to the actual throttle requested for/by the client.
2014-11-25 23:22:20 +00:00
b114f5626e
Add request drip rate to assertions for token bucket regression tests
2014-11-25 23:22:20 +00:00
8a949f0ee1
Add regression tests for token buckets on their own
2014-11-25 23:22:20 +00:00
ec3b43d28d
Make regression throttle tests consistently test target and max throttle settings.
...
As part of this also refactors code to put all throttle asserts in a single regression test method
2014-11-25 23:22:20 +00:00
548abb3b47
minor: In "show client stats" command, properly handle the case where a client has made no AgentUpdate requests (as is the case with agents that have only even been child) rather than throwing an exception
2014-11-25 23:22:20 +00:00
a9dde81753
minor: Correct letter accidentally added to copyright notice on top of Scene.cs (almost five years ago!)
2014-11-25 23:22:20 +00:00
b7ef6009a7
In Scene.AddNewAgent(), avoid a situation where an exception can result in a client being added to the manager without IClientAPI.SceneAgent being set.
...
This is done by adjusting the order of code so that SceneAgent will always be set before adding the client.
Various parts of the code (rightly) assume that a a client registered to the manager will always have a SceneAgent set no matter what.
2014-11-25 23:22:20 +00:00
e6af551007
For now, send all non-full terse updates for ones own avatar directly to the LLUDP client stack rather than queueing internally within LLClientView.
...
When an HG avatar enters a scene, it delays processing of entity updates. Could be crowding out by other updates or something else.
This delay in ones own av mvmt updates results in mvmt lag experienced on the client. Avoiding the internal LLClientView for these packets appears to resolve this issue.
Appears most noticeably for avatars with attachments, though has also been seen on those without sometimes. Hasn't been observed for non-HG avatars in general.
Will be investigating exactly what the problem is, at which point there will be a more permanent solution.
2014-11-25 23:22:20 +00:00
10095c1a58
Add "debug lludp throttles get/set request" and get current
...
This allows one to set the requested throttle (which normally comes from the client) as opposed to the max.
2014-11-25 23:22:19 +00:00
61d6bd78b3
Change the word order of some debug lludp settings for readability
...
On server, scene-throttle-max becomes max-scene-throttle and likewise max-new-client-throttle
On clients, throttle-max becomes max
2014-11-25 23:22:19 +00:00
44dc58cc7f
Add "debug lludp get/set new-client-throttle-max" to allow default new client throttle to be set separately from existing clients.
...
"debug lludp throttles get/set throttle-max" now only gets and sets current max client throttles
2014-11-25 23:22:19 +00:00
68d0c4d37b
Add "debug lludp get" command which currently just shows scene-throttle-max to mirror "debug lludp set"
...
Information is also available in "show server throttles" but that's more for non-debug info rather than attempting to get and set parameters on the fly for debug purposes.
2014-11-25 23:22:19 +00:00
336790e7b4
Add some more llGiveInventory() regression tests
2014-11-25 23:22:19 +00:00
1eb3e6cc43
When inserting missing CreatorData in the HGAssetMapper, do the rewrite on a streaming xml basis rather than loading it all into memory via XmlDocument.
...
This is because objects with lots of parts can have a lot of xml to load into memory, and this has been seen to have a noticeable performance impact.
Whereas streaming has been seen to reduce the impact in normal serialization.
Implmentation is messy but I couldn't see a better way of doing it when you can't assume that you know the exact structure of the input XML.
2014-11-25 23:21:38 +00:00
f7ab3e20bc
Add regression test TestPostAssetRewrite() to check results of HGAssetMapper.Post() object asset rewriting,
2014-11-25 23:21:38 +00:00
16a5e15443
Allow GetMesh capability to be served directly by a server like GetTexture
...
To do this required GetMesh to be converted to a BaseStreamHandler
Unlike GetTexture connector, no redirect URL functionality yet (this wasn't present in the first place).
2014-11-25 23:21:38 +00:00
281969093f
Start JobEngine by default in simulator for now.
2014-11-25 23:21:38 +00:00
1c9529aa9e
If JobEngine is active, then use it to copy/rez attachments for an avatar entering the scene that isn't initially logging on. This will execute tasks consecutively rather than concurrently.
...
This has two aims
1) Reduce initial teleport failures when a foreign Hypergrid user enters a region by not holding up the teleport for attachment rez (this can be particularly costly when HG gets all assets in the object graph.
2) Reduce server load that may impact other simulator activities.
This complements existing JobEngine options that perform initial login attachment rez and appearance send in consecutive tasks.
2014-11-25 23:21:38 +00:00
8ddcd16c69
Add an IConfigSource constructor to HGAssetBroker so that it can be instantiated directly for potentially handling some capabilities directly in services with HG active
2014-11-25 23:21:38 +00:00
d33964222a
Fix an issue where specifying both max client and server outgoing UDP throttles would cause client throttles to be lower than expected when total requests exceeded the scene limit.
...
This was because specifying a max client throttle would always request the max from the parent server throttle, no matter the actual total requests on the client throttle.
This would lead to a lower server multiplier than expected.
This change also adds a 'target' column to the "show throttles" output that shows the target rate (as set by client) if adaptive throttles is active.
This commit also re-adds the functionality lost in recent 5c1a1458
2014-11-25 23:21:38 +00:00
ead32de790
Use automatic properties for Parent and TotalDripRequest in TokenBucket to make code analysis easier. No functional change.
2014-11-25 23:21:37 +00:00
40314b56f2
Remove the unnecessary intermediate total token bucket.
...
This only had one child, which is the 'adaptive' token bucket.
So from testing and currently analysis, we can use that bucket directly which simplifies the code.
2014-11-25 23:21:37 +00:00
93f3444de1
minor: remove warnings from unused fields in LocalGridServicesConnector
2014-11-25 23:21:37 +00:00
dacd0ecfee
minor: Remove unused field from EntityTransferModule
2014-11-25 23:21:37 +00:00
a98b514184
minor: remove compiler warning from unused field in SimulatorFeaturesModule
2014-11-25 23:21:37 +00:00
df031fe8be
extend TestClientThrottleRegionLimited for 2 clients after testing 1. Renames to TestSingleClientThrottleRegionLimited()
2014-11-25 23:21:37 +00:00
dce98acb69
Add regression test TestClientThrottleRegionLimited() for testing simple behaviour of throttles where a region-wide total outbound limit is in place.
2014-11-25 23:21:37 +00:00
075f718f3f
factor out common throttle setting byte[] array construction in ThrottleTests.
2014-11-25 23:21:37 +00:00
9cdd38d0cf
Add regression test TestClientThrottleLimited() for throttle behaviour when a max client total limit is enforced server-side
2014-11-25 23:21:37 +00:00
fc878a33ed
refactor: consistently put all test classes in the OpenSim.Tests.Common package rather than some in OpenSim.Tests.Common.Mock
...
the separate mock package was not useful and was just another using line to always add
2014-11-25 23:21:37 +00:00
af0a851eba
minor: disable logging in regression test TestClientThrottleSetNoLimit
2014-11-25 23:18:40 +00:00
9934e2c545
minor: comment out unused method in regression BasicCircuitTests
2014-11-25 23:18:40 +00:00
746defa094
Add basic regression test ThrottleTests.TestClientThrottleSetNoLimit
2014-11-25 23:18:40 +00:00
52370ac94d
refactor: Move test clientstack setup code out of BasicCircuitTests into OpenSim.Tests.Common.ClientStackHelpers
2014-11-25 23:18:40 +00:00
87d5da86a1
Fix recent regression in "debug lludp throttles get" command that stopped it printing any information. Also fix max throttle displayed to be properly kbps
2014-11-25 23:18:40 +00:00
a13022c296
minor: in "show server throttles", display unset if new client throttle value is not set rather than 0
2014-11-25 23:18:40 +00:00
44e0a2f906
Add throttle-max option to "debug lludp throttles set" to allow runtime setting of default and existing client throttles.
...
Doesn't yet adjust until clients submit new throttle settings.
2014-11-25 23:18:40 +00:00
5c13980eb7
Change "debug lludp throttle *" commands to "debug lludp throttles" for consistency (and because I keep typing throttles).
...
This will still work with "debug lludp throttle" anyway.
2014-11-25 23:18:40 +00:00
d20aeefef2
Fix console set and get of max scene rate. Was performing wrong calculation - throttle buckets are set in bytes, not bits
2014-11-25 23:18:40 +00:00
10d09e287c
Eliminate 'max' throttle setting from server throttles report since this never applies.
2014-11-25 23:18:40 +00:00
679eaec22f
Allow "debug lludp throttle *" commands to work without a user name, in which case they apply to all users in the lludp server
2014-11-25 23:18:39 +00:00
a142edec03
minor: add apparant total to logging when client sets throttles
2014-11-25 23:18:39 +00:00
c73e62ea3a
minor: fix bug in throttle logging where arguments were mismatched
2014-11-25 23:18:39 +00:00
1d33a40f59
Add "debug lludp set scene-throttle-max <value>" console command to allow us to potentially set the scene max throttle on the fly.
2014-11-25 23:18:39 +00:00
a5eabdade3
Move information about "server agent rate" throttles into "show server throttles" command rather than "show throttles"
...
THis allows us to see the rates when no client is connected to the region.
2014-11-25 23:18:39 +00:00
c8f5add2fc
Add "show server throttles" command for showing server specific information about throttles
...
This is separate from the user-oriented "show throttles" command since one will often only want to know about varying client throttle settings.
Currently displays max scene throttle and adaptive throttles config if set.
2014-11-25 23:18:39 +00:00
51eb8facd6
Add OutgoingPacketsQueuedCount clientstack stat.
...
This is the total of queued outgoing packets across all connections, as also seen in the "show queues" command.
Gives some early indication of whether the simulator can't send all outgoing packets fast enough.
Though then one would want to check that this isn't due to a few bad client connections.
2014-11-25 23:18:39 +00:00
4c5fbf8b0a
minor: Remove compiler warnings from unused fields in TokenBucket
2014-11-25 23:18:39 +00:00
12daa3c3d9
refactor: Move LLUDPServer console commands into their own class.
2014-11-25 23:18:39 +00:00
f0fd2fa325
refactor: rename "debug lludp throttle status" to "debug lludp throttle get" to match set command
2014-11-25 23:18:38 +00:00
e144958e03
Add "debug lludp throttle set" command to allow setting of parameters at runtime
...
Can currently only set adaptive true|false, where adaptive = false
2014-11-25 23:18:38 +00:00
b9b483151f
Eliminate a few unnecessary calculations in the maintenance loop.
...
Also uses wait event instead of sleep for periodicity control.
2014-11-25 23:18:38 +00:00
7d30bb13be
Fix recent minor regression where the default frame time wasn't being set if there was no startup config section.
...
Caused some regression tests to fail.
2014-11-25 23:18:38 +00:00
8d72145112
If Bullet is running on its own thread, use a reset event to control timing rather than a sleep.
...
In theory, there should be no difference between these mechanisms.
However, on at least Mono 3.2.8 waiting via an event appears to be much more accurate.
2014-11-25 23:18:38 +00:00
7bababaab6
Improve frame time stability by taking a few unnecessary repeated calculations out of the main scene loop.
...
Also uses a wait event to sleep rather than a Thread.Sleep to allow the loop to be interrupted in a more controlled manner when necessary.
2014-11-25 23:18:38 +00:00
23561239ee
Make BulletSim thread be ThreadPriority.Highest if running
...
Will only effect Windows or mono with a patch such as https://gist.github.com/justincc/31e52218d098529b4696 applied
For test purposes
2014-11-25 23:18:38 +00:00
cfc4055991
Make outboudn and packet inbox handling threads highest priority.
...
Will only have any affect under Windows or mono with a patch such as https://gist.github.com/justincc/31e52218d098529b4696 (not recommended) applied.
For assessment purposes.
2014-11-25 23:18:38 +00:00
5b6fb7245a
Set ThreadPriority on main scene thread to highest.
...
This will only have an effect on Windows systems or mono with the (not recommended) mono-3.2.8 debug patch https://gist.github.com/justincc/31e52218d098529b4696 applied
2014-11-25 23:18:38 +00:00
9fb3065d33
Temporarily add root agent rez attachments work to job engine if it is running rather than as a fire and forget.
...
Experiment to see if serializing attachment rez and send initial data jobs improves other parts of sim performance.
2014-11-25 23:18:38 +00:00
859b1c5ba4
Add experimental job engine to see if queueing some existing async work during root agent entry to a region improves perf rather than always attempting to execute everything concurrently
...
Job engine is controlled via "debug jobengine start|stop|status".
Can only currently be enabled and disabled dynamically at runtime.
Currently only applies to code sending initial region data (objects, other avatar data) to a client.
2014-11-25 23:18:37 +00:00
c5a0f0ba36
Temporary hack to disable av to av collisions in bulletsim.
...
Need to do this for a test. Final implementation will be properly controlled through a property.
2014-11-25 23:18:37 +00:00
0997ce8629
Small improvements to SimulatorFeaturesModule: (1) don't overwrite extras if the grid response is invalid; (2) make the name of the config variable for destination guide consistent with the grid-wide name in LoginService; (3) account for the existence of a [USERID] in the destination guide URL
2014-11-22 20:14:09 -08:00
8d3cb424a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-11-21 08:54:30 -08:00
27512f3b42
Cleanup extraneous comments from viewer support modules
2014-11-21 08:54:10 -08:00
3a94e20d70
Merge branch 'ubitworkmaster'
2014-11-21 04:10:38 +01:00
80118ac057
Remove braindead "fix" that messed up intersim scripted giving.
2014-11-21 04:00:52 +01:00
cfaf904a3b
LSL key should be implicitly cast to a boolean value
...
Signed-off-by: James Hughes <jamesh@ascent.bluewallgroup.com>
2014-11-20 11:32:46 -06:00
3247a7cb3e
refactor: capitalize SOP.moveToTarget() and stopMoveToTarget() in accordance with code guidelines and the rest of the methods.
2014-11-19 20:12:28 +00:00
6bebb9206c
fix stopMoveToTarget in attachments case ( similar to core fix)
2014-11-19 20:11:16 +00:00
7a2c77e7ea
If calling llStopMoveToTarget() on an in-world prim, don't send an unnecessary object update if the prim was not moving to target.
...
This involves making PhysicsActor.PIDActive get as well as set.
On physics components that don't implement this (all characters and some phys engines) we return false.
2014-11-19 20:06:56 +00:00
bdebd525db
Remove SOP.StopMoveToTarget scheduled update which is now being done in SOG.stopMoveToTarget() as of last commit 67e568
2014-11-19 19:16:03 +00:00
67e56872f3
If llStopMoveToTarget() is called on an attachment, then stop the avatar if it was moving to target.
...
Same behaviour as on Linden Lab grid.
Will probably also address http://opensimulator.org/mantis/view.php?id=7369 by not generating spurious object updates when llStopMoveToTarget() is called in attachments where the avatar is not moving.
2014-11-19 19:08:33 +00:00
bb5ab05482
fix rez position being for root or center for a single object case
2014-11-19 18:20:30 +00:00
d3b43a96fb
Add 'terrain feature' command
2014-11-19 18:18:18 +00:00
7bcb68d7c4
some steps to rez center or root of prim inventory object at requested
...
position ( does nothing diferent still )
2014-11-19 16:59:11 +00:00
b4a91f5dde
return bbox and offsetHeight to RezObject
2014-11-19 16:43:56 +00:00
07074d068b
dont do recoil on llRezObject called from attachments, as seem to happen
...
at sl
2014-11-18 10:37:46 +00:00
6a8353af36
Improved SpecialUIModule so that it sends the floater data properly.
2014-11-16 10:27:10 -08:00
140c0b3bb8
n llPushObject if pushed object is a avatar use its rotation, not pusher
...
rotation
2014-11-14 06:28:48 +00:00
1a02e5d2db
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-11-11 20:42:42 -08:00
32293cfd6b
Fix the fetching of module references in the viewer support modules.
...
Remove the detachment of attachments in camera-only, because it doesn't work for HG people, and it's too drastic of a move.
2014-11-11 20:42:13 -08:00
5aa8ba1b45
Fix issue where llRemoteLoadScriptPin() would treat 0 (the default) as a valid set pin in a destination prim rather than the unset no pin state
...
Adds regression test for this case.
2014-11-11 17:59:56 +00:00
bec456c2a5
Remove the Invisible stuff and add more baked caching. Refactor selection of textures to save to Bakes module.
2014-11-11 07:09:30 +01:00
89cb07eb49
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-11-10 21:18:33 -08:00
5e34727b7e
Add additional viewer support modules that allow certain viewers to modify their UI on the fly.
2014-11-10 19:03:06 -08:00
4123b0fdbd
minor: correct console response when setting attachments logging level
2014-11-10 23:48:59 +00:00
64deb6ae6f
Second part of invisible base avatar option
2014-11-10 19:49:58 +01:00
785a2cc729
Remove JustinCCs UDP patch - it is harmful to Avination's grid management
2014-11-10 04:48:36 +01:00
36ecad98a1
Only send the actual bakes to the bakes module
2014-11-10 04:48:19 +01:00
46424a4a77
Add a new baked texure module methid to support baked texturing mesh avatars
2014-11-10 04:47:37 +01:00
6d2e924f24
Call the bake module each time we see a new attachment to see if the attachment
...
needs textures
2014-11-10 04:46:51 +01:00
c5dcc0d8c1
try to preserve permitions on object returns
2014-11-08 02:02:45 +00:00
fdb0598446
remove duplicated lines
2014-11-08 00:25:44 +00:00
f1fc557715
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-11-06 17:49:36 -08:00
ac051ef4ab
Added grid information to SimFeatures response, so that the viewer can show it.
2014-11-06 17:49:04 -08:00
caddabb5c4
scale ChildAgentThrottles with distance (internal to child server and not
...
root as was done before )
2014-11-06 22:25:16 +00:00
ead78764ab
allow drawdistance to change between 32 and MaxDrawDistance, configurable
...
value default to 256, so should have no effect. Next steps needed: reduce
client udp Throttles with distance, update childreen connections with
significat movement and view range changes, Make disconnect be delayed in time, make disconnects be receiving region action not sender on region changes. Allow distance less than 256 to only connect to visible regions, even none. Make this be relative to camera and not agent position or region centers as it is now.
2014-11-06 19:03:25 +00:00
b5e43a4b90
BUG fix : fix a very silly bug uint in place of ulong :(
2014-11-03 21:04:21 +00:00
a6ffcbb7f9
always write physicsShapeType on sop serialization since default value
...
can't be guessed in some cases
2014-11-03 00:56:48 +00:00
37a5eab0f5
BUG FIX prevent references to null scene (as happens on mesh uploads)
2014-11-03 00:03:53 +00:00
f6ae8534be
only close child agents on sucess of V1 tp not at start
2014-11-01 15:38:14 +00:00
5cca6e7d16
don't send updates for deleted agents
2014-11-01 00:01:11 +00:00
ba8e1efb43
sadly revert to resend terseUpdates enqueuing them back into entityupdates
...
queue. Viewers fail to handle correctly out of order updates with ugly visible
effects. Make sure these packets don't include acks so they aren't lost.
2014-10-31 23:34:43 +00:00
f084320976
Actually persist a changed console set agent-limit via "region set".
...
Unfortunately, it's not currently easy to do this with "max-agent-limit"
- this must be separately set as MaxAgents in region config if it's to persist over restarts.
2014-10-31 22:36:08 +00:00
a05be7bd65
Add "region set" console command.
...
This current allows one to set two region parameters
agent-limit <int> will set the current root agent limit for the region, as also settable through the viewer, though some impose a max setting (e.g. 100).
max-agent-limit <int> will set the maximum allowed root agent limit. This can also be set via the MaxAgent parameter in region config.
2014-10-31 21:47:12 +00:00
23fb4f2221
Add "region get" command as a synononym for "show region" console command.
...
This matches existing similar commands and a soon to be added "region set" command.
2014-10-31 21:47:07 +00:00
466657375a
Revert my commit that fixed unexpected behaviour re: parcel prim limits.
...
Others think different about how limits work so another solution is needed.
This reverts commit ff62b90636
2014-10-30 18:05:16 -04:00
54ab9e7d4d
set udp SocketOptionName.ReuseAddress to false, to not allow two regions
...
to bind to same port, as seems to be possible at least with mono 3.2.8,
same as patch just pushed to core by justin. This is not necessary on
windows, possible a bug on some mono versions.
2014-10-30 21:57:20 +00:00
ff62b90636
Use parcel prim limit (not region limit) when checking if area is full.
2014-10-30 11:21:27 -04:00
30f3de549a
Merge branch 'avination-current'
2014-10-30 01:32:36 +01:00
27b70c3fce
Fix a potential nullref in Vivox
2014-10-30 01:29:22 +01:00
3afd64f2f7
Fix a script load issue
2014-10-30 01:29:03 +01:00
d0dfa721f2
change last commit, need to send to Xbakes or changes will not be detected
2014-10-29 06:56:54 +00:00
7723b1bcd3
bug fix and don't send to xbakes if requesting rebakes
2014-10-29 06:55:04 +00:00
afa2466951
Fix baked textures for regions without external Xbakes adding rebake
...
requests. Those may also be trigger if for same reason one is missing even
with Xbakes. Later we can let this regions send the assets on teleports,
changing how those are serialized
2014-10-29 06:35:23 +00:00
e4d84d8ff6
try to make a avatar usesable if its siting part didn't cross, or crossed
...
back. This situation points to that sitted avatars should be sent in same
http connection that crosses the object
2014-10-28 13:52:00 +00:00
b463870914
Add hypergrid teleporting support to user profiles picks
2014-10-27 17:27:42 -04:00
f39962430c
fix parcel proprieties update sending
2014-10-26 20:43:35 +00:00
c46c3a27ae
do consider skirt baked texture on validation
2014-10-26 18:53:11 +00:00
736490dcb6
dont send baked textures assets, but send cache information
2014-10-26 18:13:44 +00:00
bc4d0179b3
remove debug message
2014-10-26 12:38:22 +00:00
b07ea475bf
delete keyframes on temporary backup group
2014-10-26 12:30:11 +00:00
525322efa2
bug fix
2014-10-26 12:24:12 +00:00
b43ce909aa
Debug... ( restored TriggerOnSceneObjectPreSave)
2014-10-26 11:28:24 +00:00
cfc8de096b
remove lock that did nothing, DEBUG disable TriggerOnSceneObjectPreSave
2014-10-26 10:48:53 +00:00
6600282fe9
another try to prevent double crossing
2014-10-26 10:08:13 +00:00
139044fc79
keep intransit flag even if deleted, dont set sog position if in transit
2014-10-26 01:25:28 +00:00
639f128d2c
some cleanup, localID coerence fix..
2014-10-26 01:27:43 +01:00
d9d58a7b33
some code reorder/minor changes
2014-10-25 23:00:41 +01:00
16608ffb01
don't backup in transit SOGs
2014-10-24 21:51:38 +01:00
21242205d1
add more temporary fixes for regionSize zero
2014-10-24 18:44:08 +01:00
d2b049b7ad
check new region size on added code for varsize till its fully suported
2014-10-24 18:32:24 +01:00
4571e5bc3e
try to make SOG crossings full async. Simplify some borders checking....
2014-10-24 18:10:28 +01:00
382df37f80
remove some Xengine errors on scripted object delete
2014-10-22 10:21:54 +01:00
31c036c044
refuse crossings if logins disabled
...
Please enter the commit message for your changes. Lines starting
2014-10-21 19:22:51 +01:00
b1ccf3f110
make sure we return false if catch() is triggered on crossing
2014-10-21 13:04:26 +01:00
59413adcee
do agent crossing async, including QUERYACCESS ( need to check vehicles for
...
this also ), so it doesn't stop heartbeat
2014-10-21 11:57:47 +01:00
afa9b4a002
Assume childreen don't need to know caps seeds
2014-10-20 09:14:27 +01:00
f44c29effb
try to fix propagation of seeds to all relevante regions
2014-10-19 15:51:12 +01:00
fadc5661c9
change position in new region estimation. Reduce border jitter margin
2014-10-18 21:34:35 +01:00
159246f88c
fix SW direction diagonal crossing
2014-10-18 20:27:33 +01:00
b7708b9d1f
change child agents creation/notification. As before this assumes that
...
sending regions close out of view connections.
2014-10-18 18:27:38 +01:00
f9588730cf
debug makeroot timing
2014-10-17 14:36:02 +01:00
2bea66ed27
send motion control state in update to childs. Reset CollisionPlane on
...
makechild
2014-10-17 14:07:11 +01:00
e99fea3398
send correct caps seed on CreateAgent to a nearby region
2014-10-17 03:08:41 +01:00
c8664e8907
Add some more llGiveInventory() regression tests
2014-10-16 19:54:40 +01:00
14259b5f99
Fix an obscure permissions exploit. Taking items from a friend's prim could
...
possibly result in a privilege escalation
2014-10-16 03:53:56 +02:00
04612f41a7
Fix transferring inventory from prims to agent inventory
2014-10-16 03:46:45 +02:00
12ebc92e55
Revert "*TEST* send udp sync. Stop uncontroled and hidden use of IO threads."
...
This reverts commit 8c41271b33
2014-10-13 23:52:19 +02:00
33ec073320
revert to async send, since past experience showed sync didn't work when
...
on mono
2014-10-13 22:46:58 +01:00
8c41271b33
*TEST* send udp sync. Stop uncontroled and hidden use of IO threads.
...
Testing this may require several people.
2014-10-13 13:17:48 +01:00
a301bad8ad
on util thread pool reduce the min number of threads, increase the
...
maximum and increase the idle time before release to OS
2014-10-13 12:10:13 +01:00
9d52b7ff71
name the thread
2014-10-13 12:01:36 +01:00
cd87c4bec5
change/fix previus commits
2014-10-13 12:00:31 +01:00
6794508f8c
reduce minimum number of smartpool threads and name it
2014-10-13 11:41:11 +01:00
9a3df6445e
move AnimationSet and AvatarSkeleton to OpenSimExtras
2014-10-12 12:52:12 +01:00
10d3d0c81d
try to reduce avatar bounce on falls. Not all possible side effects
...
checked, specially on portals
2014-10-12 01:14:54 +01:00
39cfd82303
add simulator features AvatarSkeleton and AnimationSet report
2014-10-11 22:53:47 +01:00
c3e88b7b38
changed skeleton, do parse the mesh on upload to check skeleton. Sooner or
...
later this parsing needs to validate the model cost also.
2014-10-11 22:41:59 +01:00
cc71dd9a27
dont let test mesh go to meshes inventory folder that is not displayed by
...
viewers
2014-10-11 11:12:43 +01:00
dab2e778d6
bug fix
2014-10-11 10:22:57 +01:00
1a6ef2d60e
check for avatar skeleton data on meshs headers on cost estimation. Dont
...
let a model have more than one mesh with skeleton, for testing create a
mesh inventory item, for this meshs. Add also option to read a avatar
collider replacement. This information still needs to be saved somewhere
so it can be checked on attachment, etc, without parsing the mesh asset again.
2014-10-11 10:01:26 +01:00
00b23e51ae
Change name of just added OSSL osForceSit() to osForceOtherSit()
...
This is somewhat more in keeping with something like osForceAttachToOtherAvatarFromInventory()
and potentially allows a separate osForceSit() command with High threat rather than VeryHigh that only sits the owner and can be enabled without enabling sit of other avatars.
2014-10-11 00:14:35 +01:00
5acbbcb33f
minor: spacing cleanup from previous commit 79a4d1ea
2014-10-11 00:10:49 +01:00
79a4d1ea8d
Implements osForceSit(string avatar) & overload osForceSit(string avatar, string target)
...
Allows a script IN the target prim to force an avatar to sit on it using normal methods as if called by the client.
Overload method of osForceSit() to allow a script NOT in the target prim to force an avatar to sit on the target prim using normal methods as if called by the client.
This patch is based on previous work from
http://opensimulator.org/mantis/view.php?id=4492
and also includes the suggestions from justincc including change of threat level
Thank you Christos Lightling.
2014-10-11 00:04:25 +01:00
5db3f08871
minor: add --default-user option to "load oar" help long description. Do other small tidies of "load oar" console command help.
2014-10-11 00:03:05 +01:00
c7a11899f6
Give ability to define constants that may be used throught the configuration
2014-10-09 14:59:54 -04:00
29a05cdeb5
Change thread of osForceAttachToOvtherAvatarFromInventory to VeryHigh from Severe
...
It fits much better in this category.
2014-10-08 23:35:25 +01:00
458ccd26ff
Use Scene or IEntityTransferModule directly in HGEntityTransferModule instead of casting or re-obtaining module.
...
This code originates from when IEntityTransferModule was shared rather than one per region.
Now it's one per region we know that callers are always in the same scene as the module.
2014-10-08 23:16:01 +01:00
8d4c1945c2
HG Restricted appearance checking code is only called when HG teleporting via the map but bypassed completely when teleporting via landmarks. This fixes this by including a call when acting on landmarks. Does not affect local grid teleports as flags are checked.
2014-10-08 23:04:19 +01:00
c0a75fcc03
fix targetOmega resend on deselect on the right place, can't be at sop
...
but packethandlers
2014-10-06 00:17:41 +01:00
c3a1d6b5ef
reduce some avatar engine strenght
2014-10-05 18:55:37 +01:00
44a42efa4b
try to help steps climb a bit compensating the bounce reduction
2014-10-04 08:46:46 +01:00
57caf468e8
bug fix: resend part targetOmega on deSelect
2014-10-04 08:30:04 +01:00
6f149ef6ae
bug fix: leave jumping state only to landing, without fallback into
...
onsurface, etc
2014-10-04 07:49:05 +01:00
4ae960a4f0
bug fix: revert back check on creating link
2014-10-04 03:43:20 +01:00
cbd428cff3
Add LSL transaction_result event.
...
This is cinderblocks' transaction_result.diff from http://opensimulator.org/mantis/view.php?id=7329 but I have used lsl.parser.cs and lsl.lexer.cs files generated directly from opensim-libs rather than those supplied in the patch.
I also added scriptEvents.transaction_reuslt.
The required parser/lexer generation file changes were made in commit d564f28 in the opensim-libs repo.
Thanks!
2014-10-04 00:16:47 +01:00
94f42cef90
added a missing angularVelocity.Zero on sitting, removed odd camera based
...
movement vectors, plus little other things
2014-10-03 18:32:52 +01:00
c496bd57b4
minor: Comment out received seed caps request logging for now
2014-10-02 22:33:58 +01:00
43520b3e8b
Add "debug lludp throttle status" command to return status information about a client's throttle (currently just whether adaptive is enabled).
2014-10-02 22:30:44 +01:00
05508b5c56
Add "debug lludp throttle log <level> <avatar-first-name> <avatar-last-name>" to control extra throttle related debug logging.
2014-10-02 22:30:44 +01:00
2a9528fa22
Don't unnecessarily remove from backup objects that were not directly attached from the scene.
...
These are never in region backup in the first place since recent 11830c43
2014-10-02 22:30:44 +01:00
57e75d7c03
Do not add attachments to the region scene object backup list.
...
Attachment persistence is not handled in this way and this just results in a load of busy work until a check in each SOG terminates a backup check for attachments anyway.
2014-10-02 22:30:44 +01:00
afa85e6b3c
Set appearance refresh to false by default.
...
This setting was originally added some time ago to deal with issues where appearance was not received properly by all users.
However, it does not scale well with large numbers of agents.
Disabling to see if the original problem has abated or whether this will have to be tackled in another way.
2014-10-02 22:30:44 +01:00
6d1f1103f3
clean up coments, use a even faster XY move request detection
2014-10-01 16:36:06 +01:00
4c8819a143
removed useless unreal inworld movement vector estimation. Do animation state using movement control flags only, on avatar frame of reference. This will hold
...
valid until the up direction is allowed to be diferent from the world one.
2014-10-01 04:32:19 +01:00
49bf83ecb8
do global position X and Y with double precision in autopilot, so
...
corrected viewers do work
2014-09-30 23:31:55 +01:00
b9be9097aa
fix a incomplet landing handling case
2014-09-30 17:02:24 +01:00
c704b079d8
persist script changes to mediaURL and musicURL ( heavy thing )
2014-09-30 04:24:31 +01:00
f117a86c87
fix musicURL change being sent back with wrong snap_selection, and not
...
sent to other avatars.
2014-09-30 03:31:04 +01:00
2af7205813
keep same animation if in transit
2014-09-30 00:13:52 +01:00
1b2e2a86a3
remove check of other prim top height on steps climb code
2014-09-29 23:24:22 +01:00
cfb1a27300
Merge branch 'master' into ubitworkmaster
2014-09-29 20:36:03 +01:00
3052a53889
change avatar physics and motion control. Still not that good :(
2014-09-29 20:17:05 +01:00
4e28a06f3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-09-28 16:10:57 -07:00
763c22b28e
Improve on the last commit to InventoryArchiver: put back the original constructor (3rd party modules use it), change order of new parameters to make it more consistent.
2014-09-28 16:10:32 -07:00
dbc0dfa606
Also fetch and store old asset for animation sets
2014-09-27 22:18:43 +02:00
f60139cb91
Reinstate the part of the id theft protection that was lost in a long ago merge
2014-09-27 21:17:56 +02:00
f0218258d1
When a prim is bought through BuySellModule, the click action is not changed back from buy object. This means that after the object is bought, it still appears as if for sale which can be confusing. This sets it back to touch, the default after sale.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-27 12:54:00 -04:00
3ea76e3131
Make changes to AnimationSet to allow indexing by names rather than indices. Add some debugging output and prepare for parsing an ascii-based format.
2014-09-27 02:30:01 +02:00
530b0cbbf1
Move expired objects cleaning trigger to the maintenance thread of a region rather than it's main scene loop.
...
[Startup] default setting UpdateTempCleaningEveryNFrames becomes UpdateTempCleaningEveryNSeconds.
Default becomes 180s instead of effective 182s (which would also vary with any changes in frame time or extra long frames)
2014-09-27 00:23:52 +01:00
31c8b7fd1a
Fix recent regression with llRegionSayTo() started sending messages twice.
...
Addresses http://opensimulator.org/mantis/view.php?id=7330
Fixed by removing chat delivery to avatar from WorldCommModule.DeliverMessageTo(), in common with existing similar methods that only handle deliver to script listeners.
Preserves fixes from http://opensimulator.org/mantis/view.php?id=5005
2014-09-26 23:35:29 +01:00
46caea6987
change it again...
2014-09-26 15:03:33 +01:00
90cad82405
remove unnecessary argument ref
2014-09-26 14:22:54 +01:00
fcad64209c
make c# more happy
2014-09-26 14:17:01 +01:00
5f57b55dc9
use central animationset permitions define
2014-09-26 14:08:21 +01:00
09e05d48b9
refuse to do a inventory link if provided asset type is not a link or
...
folderlink
2014-09-26 13:28:24 +01:00
d29a04fc20
remove debug msgs
2014-09-26 03:52:10 +01:00
598ab37b97
debug msg
2014-09-26 02:52:44 +01:00
db41c04f9d
little debug
2014-09-26 02:29:05 +01:00
9fcee73326
Make "generate map" console command also trigger upload to maptiles as well as asset generation without performing tile generation twice.
2014-09-26 01:02:19 +01:00
8c68772624
bug fix: add missing attach to region heartbeat event to update animations
2014-09-26 00:54:06 +01:00
e37637587a
Add a sample use for the validation
2014-09-25 22:03:02 +02:00
3a42ea5279
Extend upload verification to all upload paths
2014-09-25 21:21:20 +02:00
57166878b5
fix animation asset name to "animatn", use "animset" for the new
...
animationSet
2014-09-25 16:37:43 +01:00
f51779bb05
add also the name animset until its clear the name liru will use
2014-09-25 14:10:44 +01:00
18cc33e2c5
add animationset to upload assets, for now no cost
2014-09-25 13:35:30 +01:00
d3578e2662
Add "debug lludp data out" console command for logging outgoing data just before it's put on the wire.
...
Unlike "debug lludp packet" which logs at the point where OpenSim first asks the clientstack to send a certain outgoing packet, this logs immediately before the actual send.
For low-level debugging purposes.
2014-09-24 23:44:55 +01:00
c9079360b9
coment out stack trace at newUserConnection, add log msh at createAgent
2014-09-24 18:37:59 +01:00
46bf6d1640
add stack trace debug message
2014-09-24 18:29:23 +01:00
c031f21851
fix wrong format
2014-09-24 16:37:21 +01:00
f106aea388
add debug message
2014-09-24 16:33:33 +01:00
1491ba3500
change melanies patch, reusing caps if circuit and caps path is the same.
...
Do the aditional cleanup, if the path did change
2014-09-24 16:01:25 +01:00
4206c1248f
same thing on another lock(acd)
2014-09-24 01:51:36 +01:00
d96fe6eaf5
replace a lock on a unkown origin object with a lock on a well defined
...
one.
2014-09-24 01:37:51 +01:00
c015cb3134
Remove an unnecessary check at the bottom of Scene.CloseAgent()
...
At this point sp != null so no check required.
2014-09-24 00:50:24 +01:00
6d2cdd31fe
populate collision lists with LinkNumber, and detected structure in
...
Xengine
2014-09-23 23:59:05 +01:00
f37364b56f
Merge branch 'master' into ubitworkmaster
2014-09-23 23:20:28 +01:00
309cfeff88
If an agent is logging in, rather than teleporting, make sure all known
...
circuits for that agent are closed.
2014-09-23 21:53:09 +02:00
bde60cc92e
Add persistent command history in console
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-23 10:36:00 -04:00
1e22091193
Modifications to previous IAR commits to bring them more inline with existing OpenSim code conventions. Also include new IAR save switch in console help print out.
2014-09-23 00:04:59 +01:00
5bc3bbbcf3
Add an event callback for loading IAR files. The callback for creating them already existed but not for loading. This is of interest for use by region modules. Also includes reporting numbers of items saved and items filtered to the completed log printout.
2014-09-23 00:04:53 +01:00
08675d44a7
Change existing IAR save to use UUID for its callback reference instead of Guid. This is for uniformity as discussed on IRC.
2014-09-23 00:04:50 +01:00
3bde737f76
Include same content filters for IAR file exports that already exist for OAR files. Adds new console switch --perm=CTM to save iar command.
2014-09-23 00:04:45 +01:00
992bd703e7
fix building state logic...
2014-09-23 00:04:03 +01:00
79e47eb60e
some changes in link/unlink code, bypassing complex variables set methods
2014-09-22 23:32:55 +01:00
c82e456345
debug show stack trace
2014-09-22 21:13:36 +01:00
4cc552162e
Merge branch 'ubitworkmaster'
2014-09-22 18:50:06 +02:00
0bfba122f0
When a ghosted avatar is removed, also remove any remaining CAPS
2014-09-22 18:49:08 +02:00
ea4a526095
a few more changes on link/unlink
2014-09-22 16:09:39 +01:00
b7fca5bcac
same in a few more spots
2014-09-22 14:44:47 +01:00
fe3c1b9e98
send to world or backup, after setting finding information
2014-09-22 14:32:56 +01:00
bcaf202e34
update scenegraph group find by part information in sog link, so script link functions do update that also.
2014-09-22 13:59:23 +01:00
a70ed79c39
compile fix
2014-09-21 23:26:17 +01:00
d1ccc6d5cc
release lock a bit sooner when not needed, add a try on more complex db
...
store call
2014-09-21 23:23:20 +01:00
f95bb53371
remove LockItemsForRead(false) without previus call with true
2014-09-21 23:02:02 +01:00
adda696cd0
protect getting the item
2014-09-21 22:46:44 +01:00
51ec2d83ac
remove redundant code
2014-09-21 22:43:17 +01:00
2ed3a918bd
Merge branch 'master' into bullet-2.82
2014-09-21 07:11:00 -07:00
4002cd96a5
When sending http requests, close the response stream instead of waiting
...
for the finalizer to do it, if it ever does.
2014-09-20 20:42:07 +02:00
9c552212a9
exclude npcs from baked cache
2014-09-19 16:51:51 +01:00
242bb425f3
fix positions on same frames transitions
2014-09-19 01:07:20 +01:00
519c753e46
This fixes the Scene thread renaming issue
2014-09-17 20:25:27 -04:00
96a2449122
Undo "Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.""
...
Fix for break in next commit
This reverts commit 376fab1402
2014-09-17 20:03:54 -04:00
427240f935
Changes to be committed: modified: OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs modified: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs This solves mantis bug# 5005: llRegionSay script does not trigger ChatFromWorld event. This was solved by adding World.SimChat() command to the llRegionSay() function (per suggestion of DrCuriosity). Additionally this fixes llRegionSayTo() which was also not functioning by adding a World.SimChat() command and adding a new SimChatToAgent() overrided function to Scene.PacketHandlers.cs This is the second patch revision. Corrections made to the position of World.SimChat() and removal of tabs per suggestion by justincc.
2014-09-17 23:37:18 +01:00
376fab1402
Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects."
...
This reverts commit af286d5fcb
2014-09-17 18:11:41 -04:00
af286d5fcb
Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.
2014-09-17 17:56:10 -04:00
6e015125c5
Merge branch 'master' into ubitworkmaster
2014-09-17 21:48:36 +01:00
ce8ea55f4e
... and a few more..
2014-09-17 17:25:07 +01:00
9f07c64690
another close()
2014-09-17 16:51:07 +01:00
f254761649
turn off Nangle on users of ServivePointManager like webrequests
2014-09-17 14:47:36 +01:00
1953a0f4e0
Dont add to physics in a child update. It is missing several checks like
...
sit. makeroot should to it
2014-09-17 13:36:39 +01:00
affcdcce8b
try to send fly state on tps
2014-09-16 21:25:06 +01:00
8014ce7f1a
Fix a nullref in a debug message. If we have no SceneAgent, we can't output data from it.
2014-09-15 23:15:27 +02:00
d43d3df724
Reinstate closing the client if CloseAgen returns false. This was part
...
of the last Ubit patch.
2014-09-14 20:46:22 +02:00
3d9f25a19d
revert changes to m_pendingCache and remove client close if there is no
...
SP, as requested
2014-09-14 02:28:42 +01:00
52cde5fe96
Merge branch 'master' into ubitworkmaster
2014-09-14 01:18:03 +01:00
908e0e1cef
do not use a blind expire of m_pendingCache. Entries must be valid while
...
respective HandleUseCircuitCode, no matter how long it takes, so a viewer
retry doesnt start a overlapping one. It HandleUseCircuitCode
responsability to always remove entries, even on fails. Remove a client
even if m_scene.CloseAgent fails.
2014-09-13 20:37:20 +01:00
8ab5f2ce84
When CloseAgnt is called with an agent id that doesn't have a presence, check for stray clients and clean them up instead of failing.
2014-09-13 16:39:56 +02:00
42b2248960
If a client's SceneAgent is null, that client is not fully logged in or
...
crashed while logging out. Don't reuse it, create a new one.
2014-09-13 00:49:32 +02:00
2d3072f053
When osNpcMoveToTarget() is called for a sitting avatar then silently do nothing rather than throwing an error.
...
Resolves http://opensimulator.org/mantis/view.php?id=7311
2014-09-12 23:37:44 +01:00
ffe5ede550
taskInventory request: give each transfer a diferent filename, Add more
...
agressive lock
2014-09-12 11:48:43 +01:00
70953dbfcd
Fix issues where setting llSetTextureAnim(FALSE... did not work properly).
...
I ended up amalgamating patches from http://opensimulator.org/mantis/view.php?id=7313 and http://opensimulator.org/mantis/view.php?id=7318
Thanks a lot to both bobshaffer2 and cinderblocks.
2014-09-12 00:34:39 +01:00
a3bd708e77
Fix regression from recent a02dae5 where stand positions are no longer correct when a sit target is specified.
...
Adjusts stand position using just avatar position relative to the root prim instead.
Fixes http://opensimulator.org/mantis/view.php?id=7315 and preserves previous fix for http://opensimulator.org/mantis/view.php?id=7299
2014-09-11 20:59:20 +01:00
df8eae1957
handle AO sit ground case
2014-09-10 20:55:00 +01:00
f66b58cf00
*TEST* add movement states SIT and SITGROUND. ScenePresence on SIT,
...
SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits
2014-09-10 19:30:57 +01:00
0caa59b286
Fix a nullref that can hit Vivox voice
2014-09-10 02:43:51 +02:00
724d174a77
it its a default ( internal ) animation return its name in lower case
2014-09-09 23:36:10 +01:00
13cb6ef6ef
remove the check animState == anim for same reasons
2014-09-09 23:30:31 +01:00
4842806ea8
look for animation on part inventory before default animations, so
...
user can use same name. Search directly on default animations using
uppercase.
2014-09-09 23:22:36 +01:00
e37fd5e716
force update of movement animation
2014-09-09 22:27:21 +01:00
9d815e2d2a
on SetAnimationOverride do a UpdateMovementAnimations();
2014-09-09 22:07:03 +01:00
016e58e354
*test*
2014-09-09 21:53:27 +01:00
87a4abac50
Plumb the rest of the serverside AO
2014-09-09 20:50:41 +02:00
339904bc52
Merge branch 'ubitworkmaster'
2014-09-09 20:16:43 +02:00
2d2823f1de
Add some case magic and send an anim pack when an override is set
2014-09-09 20:16:02 +02:00
002a2deaf9
add full delete if uuid iz zero and state is ALL
2014-09-09 19:09:06 +01:00
46abe0c86d
Merge branch 'master' into ubitworkmaster
2014-09-09 13:54:00 +01:00
683f2cc892
only cancel attchment needed update type on sending sheduled updates.
...
This is wrong but its as original worked
2014-09-09 13:32:22 +01:00
4ed3461573
huds bug fix
2014-09-09 05:20:43 +01:00
347c5b3070
Add perms check
2014-09-09 05:20:53 +02:00
f4efa25820
remove messing with KeyframeMotion on attach
2014-09-09 03:54:27 +01:00
b732ee8d27
dont force Phantom on attachments, breaking no mod objects if wear by
...
mistake
2014-09-09 03:47:51 +01:00
136749c651
drop attachments with original physical proprieties
2014-09-09 03:45:26 +01:00
aa84ad369c
Add some forgotten calls
2014-09-09 04:35:08 +02:00
d2324b64c7
Add missing file
2014-09-09 04:12:58 +02:00
18023169e7
Actually do the overriding
2014-09-09 04:12:10 +02:00
5376d0a97b
Also check standard anim names
2014-09-09 03:31:04 +02:00
17154fbffa
set default LinksetPhysPrims to 0 so max number of prims for physical
...
object is disabled
2014-09-09 02:22:07 +01:00
d00aa403e0
Merge branch 'master' into ubitworkmaster
2014-09-09 02:05:44 +01:00
e775e1a317
make PERMISSION_OVERRIDE_ANIMATIONS implicit for attachments
2014-09-09 03:03:27 +02:00
f2390f7c72
Plumb llSetAnimationOverride
2014-09-09 03:01:05 +02:00
51697944b6
dont send fullObjectUpdate on deselect
2014-09-09 00:09:39 +01:00
8e15d4ad57
limit number of prims on physical objects. Not all cases covered still
2014-09-08 23:58:49 +01:00
93143ba012
on drop send full update on root prim, terse on others ( as sl ). Fix
...
count down of number of physicial prims on attach, if removing them
2014-09-08 23:44:29 +01:00
25b4e268a3
change attachment drop, to make object Phanton. THis is not as SL, but
...
rez position is automatic and object interpenetrations will
happen including with the avatar, with the usual ugly effects.
2014-09-08 11:16:59 +01:00
2d352e6348
*NEEDS more testing* on attachment drop: fix adding prims to physics
...
engine, remove disturbing phantom flag. On attach: fix removing prims from
physics engine, delete any keyframeMotion, remove physical flag. This is
executed in all attachs possible only need on attach from the scene (?),
but its where original code removed only root part from physics engine
2014-09-08 02:19:53 +01:00
e5b269e9a0
Merge branch 'master' into bullet-2.82
2014-09-05 21:20:02 -07:00
41f2f3132b
For monitoring purposes, start non-timeout tasks (which do not currently use a threadpool) via Watchdog.RunInThread() rather than Util.RunThreadNoTimeout()
...
The functionality is the same but this allow us to monitor such tasks via "show threads" and abort them for test purposes, etc.
Also extends thread names to provide more info (e.g. SendInitialDataToClient says what client the task is for).
2014-09-05 23:20:59 +01:00
cf1d58d164
do not send objectproprieties on sop.SetGroup(). I many cases this will
...
arrive before creating the object in viewer with respective full update
2014-09-05 15:16:13 +01:00
25bc349ec9
near region check on tp needs to be a full current view check.
...
sp.KnownRegions is unreliable for this.
2014-09-05 12:28:57 +01:00
e4d16e6795
Make LLUDP output queue refill thread active by default, since load tests have shown that this has better scalability.
...
For testing, previous behaviour can be restored with the console command "debug lludp oqre stop" at runtime.
2014-09-04 18:24:59 +01:00
47ac103df7
Merge branch 'master' into bullet-2.82
2014-09-03 21:21:01 -07:00
73e20b7f5f
For processing outbound http requests in the XMLRPCModule, start the thread through Watchdog for monitoring and stat purposes.
2014-09-04 00:22:30 +01:00
0692ebfbc6
Start long-lived thread in IRCConnector via watchdog rather than indepedently, so that it can be seen in "show threads" and stats
2014-09-04 00:00:51 +01:00
4b04d22899
Don't need to check separate physics status in bulletsim update since that method is only run for an indepndent thread anyway.
...
Also remove bulletsim monitored thread from watchdog on shutdown.
2014-09-03 23:53:04 +01:00
6e6512eb4a
Make bulletsim thread alarm if no update for 5 seconds.
...
The cost is minimal (also done for scene loop) at the benefit of telling us if this thread simply stops for some reason.
2014-09-03 23:43:59 +01:00
29400538b7
minor: fix indenting from previous commit b08ab1e
2014-09-03 23:37:20 +01:00
b08ab1e375
If BulletSim is running on its own threads, start this thread via the thread watchdog.
...
This allows us to see the presence of the permanent thread via the "show threads" console comand.
Also adds the region name to the thread name.
2014-09-03 23:35:18 +01:00
40c579addf
Don't show the ScrLPS data twice in the WebStats based statistics page.
2014-09-03 14:17:37 -04:00
ac866a1c46
Add [EntityTransfer] AllowAvatarCrossing setting to determine whether avatars are allowed to cross regions at all.
...
Defaults to true. For test purposes.
2014-09-03 00:25:56 +01:00
d582db6132
Fix recent regression from 473c5594 where camera started to judder on moving vehicles.
...
Other parts of OpenSimulator are relying on SP.Velocity == 0 for vehicles.
So add and use SP.GetWorldVelocity() instead when we need vehicle velocity, along the same lines as existing SP.GetWorldRotation()
2014-09-02 23:39:52 +01:00
0514679b15
reduce MIN_CALLBACK_MS guard time. A value too high introduces a extra
...
throttle and makes more packets to be sent in bursts and not in steady
state flow.
2014-09-02 18:51:49 +01:00
6611e75a2b
void time change between gettime calls
2014-09-02 16:11:46 +01:00
50433e089b
*needs testing, not that good* change throttles math using floats and not
...
int64, etc. Limite brust bytes to the total rate client requested times a
look ahead estimation time, Avoid queues starvation with updates waiting...
2014-09-02 15:48:59 +01:00
3d65d22138
Merge branch 'master' into bullet-2.82
2014-08-30 08:29:39 -07:00
473c559478
As per the LL grid, if an avatar is sitting then return it's velocity relative to the region rather than relative to its seat.
...
Resolves http://opensimulator.org/mantis/view.php?id=7175
2014-08-30 01:09:33 +01:00
bb7c88805a
As per the LL grid, for attachments make llGetObjectDetails() OBJECT_VELOCITY return the avatar's velocity and not always Vector3.Zero.
...
This completes http://opensimulator.org/mantis/view.php?id=7177
2014-08-30 00:58:47 +01:00
4d8bc007e2
minor: fix wrong indentation in previous commit 0cc3cd
2014-08-30 00:54:36 +01:00
0cc3cdfb4e
As per the LL grid, for attachments make llGetObjectDetails() OBJECT_ROT return the avatar's rotation.
...
This is already the behaviour of OBJECT_POS.
Partially satisfies http://opensimulator.org/mantis/view.php?id=7177
2014-08-30 00:48:59 +01:00
a02dae566c
Fix issue where moving a seated avatar would not adjust their subsequent stand position.
...
Addresses http://opensimulator.org/mantis/view.php?id=7299
2014-08-30 00:26:18 +01:00
099212167b
Implement STATUS_BLOCK_GRAB_OBJECT in llSetStatus()/llGetStatus() and correct effect of STATUS_BLOCK_GRAB
...
As per http://wiki.secondlife.com/wiki/LlSetStatus
Setting STATUS_BLOCK_GRAB_OBJECT prevents or allows move of a physical linkset by grab on any prim.
Setting STATUS_BLOCK_GRAB prevents or allows move of a physical linkset by grab on a particular prim.
Previously, setting STATUS_BLOCK_GRAB would prevent drag via all prims of the linkset.
2014-08-29 23:40:21 +01:00
1b75ec5647
Ignore whitespace when reading serialized XML objects.
...
This was previously effectively being done by XmlDocument in the multiple passes through the XML.
This change tells XmlReader to ignore whitespace. This also means changing arguments to use XmlReader instead of XmlTextReader (a descendent of XmlReader) directly.
XmlReader.Create() has been the recommend way to create XML readers since .NET 2.0 as per MS SDK and is the only way to specific ignore whitespace settings.
2014-08-29 19:08:23 +01:00
3555c0c3f3
Fix recent regression test TestDeserializeXmlObjectWithOtherParts() which was not meant to indent the input xml
2014-08-29 18:14:47 +01:00
305c3e668a
Add regression test for deserializing xml objects with more than one non-root part.
2014-08-29 18:06:29 +01:00
18de5c8a2d
make use of it in GetMeshModule, and meshs are Assets not Task itens,
...
reduce MeshModule impact on udp rate
2014-08-29 16:30:49 +01:00
7351d92a76
add method to get a category throttle rate
2014-08-29 16:19:30 +01:00
fd0a635302
reduce burst
2014-08-29 15:13:46 +01:00
438798202f
replace the tick() by a limit on the maximum number of tokens that can be
...
acumulated ( variable named BurtRate, not exactly a rate...)
2014-08-29 13:26:30 +01:00
6f590c2f79
disable first drip
2014-08-29 00:05:57 +01:00
986863a0cd
try to reduce insane high data rate udp bursts. This needs testing on a
...
region with a lot of contents. Should not affect much average rates.
2014-08-28 22:26:03 +01:00
894b5c10c6
remove misplaced comment
2014-08-28 18:54:08 +01:00
9839904ebe
try to make sense of throttle rate limits
2014-08-28 18:51:55 +01:00
1a3ffda852
minor: Eliminate more unnecessary code copying individual parameters for Vector3 copying in Scene - this is not necessary as Vector3 is a value type
2014-08-28 18:37:34 +01:00
f132f642b2
On code section that rezzes single objects and attachments, reduce CPU use by reading asset XML a single time with a stream reader rather than multiple times.
...
Reading large XML documents (e.g. complex attachments) is CPU expensive - this must be done as few times as possible (preferably just once).
Reading these documents into XmlDocument is also more resource intensive than using XmlTextReader, as per Microsoft's own publication "Improve .NET Application Performance and Scalability"
Optimization of other cases will follow if this change is successful.
2014-08-28 18:15:33 +01:00
5a2d4fd47f
add some functions for estimation of number of bytes that can be send in a category in specified time
2014-08-28 16:49:32 +01:00
ff4df688ba
send all presences terseupdates in same batch
2014-08-28 12:55:31 +01:00
ade4bf69b1
if we send wearables with ThrottleOutPacketType.HighPriority, then we
...
should send other avatarinformation with same priority on same Task category ( plus cleanup )
2014-08-28 10:38:31 +01:00
38fc1cc445
try to make child presence know its root region. Incomplete, some paths dont send the information.
2014-08-28 00:44:59 +01:00
b871029a30
dont create a cadu that is not used. Add a root region global position
2014-08-27 18:05:40 +01:00
73cdafd6c9
dont mess throotles values sent to child presences. Some cleanup
2014-08-27 15:57:12 +01:00
012d0b07bc
Merge branch 'ubitworkmaster'
2014-08-27 11:25:17 +02:00
1e888d61ca
enqueue also if m_nextPackets[category] is not null. This is really the
...
top element of a category queue, equivalente to using a queue.peek() if
avaiable
2014-08-27 01:33:09 +01:00
07ee101a05
bug fix. Was not deleting attachments if on public parcel
2014-08-27 01:09:11 +01:00
620443f858
on TPs to nearby regions, only send kills if needed by parcel privacy
2014-08-27 00:37:05 +01:00
b1ff78f4d8
Don't allow update timer to invoke another scene update if the previous is still active.
2014-08-26 18:52:09 +01:00
bafa82eb12
Remove race conditions from where SP.AbsolutePosition could change between the various property checks.
2014-08-26 18:25:14 +01:00
42bb122232
Fix frame times when updating scene on timer.
2014-08-26 18:13:38 +01:00
64f640f901
Implement experimental non-default mechanism to update scene via a timer rather than a persistent thread with sleep.
...
This is to see if an inaccuracy in sleep times under load is responsible for increase in frame times even when there is spare time still available.
Can currently only be activated by setting "debug scene set update-on-timer true".
Can be switched between timer and thread with sleep updates whilst the scene is running.
2014-08-26 18:13:38 +01:00
92b0b27caf
dont append acks to a resend packet
2014-08-26 17:42:44 +01:00
dde2ac2544
still testing
2014-08-26 02:22:25 +01:00
3ee6144d0c
even less kills on tps
2014-08-26 00:00:21 +01:00
6857afe2a4
*test* back to no sog kills, little retouch on attachment updates,
...
NameValue AttachItemID is a root part thing only
2014-08-25 23:31:04 +01:00
75cbe620c0
*test* cleanup the bugs nest
2014-08-25 22:45:31 +01:00
c24601bc6a
change enconding of attachment updates NameValue and State fields
2014-08-25 21:49:39 +01:00
56081dc5e1
Merge branch 'ubitworkmaster'
2014-08-25 20:33:12 +02:00
b1f14ad62f
back to just kills
2014-08-25 14:15:53 +01:00
385fcbb75e
*test* send kills and hack
2014-08-25 13:58:50 +01:00
094d8686e5
put back the kills on tp where they belong
2014-08-24 02:23:00 +01:00
d5814ccf65
*test* move sending kills to before sending the update, this breaks tp
...
abort
2014-08-24 01:04:32 +01:00
f4a6be8654
clean sendKill a bit, remove a IsChild that is set too early in a calling
...
path
2014-08-24 00:44:14 +01:00
06b6238d00
send avatar kills after attachments, send otherattachments before rest of
...
sog ( updates will mess this again but well... )
2014-08-23 22:24:28 +01:00
d55041d934
on updates, send rotations using livomv Quaternion.toBytes() again
2014-08-23 21:13:30 +01:00
63d1916f51
Remove entities from updates queues on kill. Do it sync so enqueues after
...
the kill work
2014-08-23 20:59:11 +01:00
9ce1fd7a3c
Merge branch 'avination-current'
2014-08-23 19:39:31 +02:00
1fc5dadc60
Add an admin message to refesh a region's map tile. Will be used to periodically
...
rebuild the world map to clean out unused tiles.
2014-08-23 19:38:08 +02:00
1a7efc2c64
Change the map tile system to be multi-grid hosting compatible
...
Conflicts:
OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
2014-08-23 17:33:14 +02:00
cbd7c7b9ec
Change the map tile system to be multi-grid hosting compatible
2014-08-23 17:27:01 +02:00
8fd836c299
back to sending attachment sog kills in place of the hack. This is the
...
official way of doing it
2014-08-23 12:03:55 +01:00
1aa335078a
sop SendFullUpdate() goes by presence if it is a attachment
2014-08-22 21:54:00 +01:00
0295e6822d
some cleanup ( well or not )
2014-08-22 20:01:07 +01:00
9a8d8d2130
Merge branch 'master' into ubitworkmaster
2014-08-22 01:06:43 +01:00
c95fd60806
revert the kills, they seem even worse
2014-08-22 00:28:05 +01:00
0da7f8e863
silly...
2014-08-22 00:01:50 +01:00
be02fb3904
replace hack by sog kills on tp out
2014-08-21 23:43:06 +01:00
d5bb80798d
make the hack more extensive. Forbid sog/sop updates if Intransit but
...
release it sooner
2014-08-21 23:18:51 +01:00
6674548af0
replace AgentHasMovedAway + KillEntity by a hacked version on teleports
2014-08-21 22:42:45 +01:00
7ba3b88fb6
Merge branch 'master' into bullet-2.82
2014-08-21 06:36:19 -07:00
674be72225
BulletSim: add new Bullet 2.82 constraint type codes and rename the
...
BulletSim fixed constraint to not be confused with the native version.
2014-08-21 06:33:04 -07:00
ad83b18634
some cleanup..
2014-08-21 14:07:55 +01:00
b68c814bc6
...
2014-08-21 10:53:59 +01:00
114144407b
variations..
2014-08-21 09:32:36 +01:00
5f1cb6542d
test
2014-08-21 06:35:11 +01:00
ad6f942279
add filter sog updates
2014-08-21 06:11:19 +01:00
d98d64a61a
bug fix
2014-08-21 05:28:35 +01:00
d2f3a19838
test
2014-08-21 05:00:51 +01:00
6acfa77919
test
2014-08-21 04:35:04 +01:00
87f03c040c
bad test
2014-08-21 04:07:23 +01:00
f06f13b59d
Merge branch 'ubitworkmaster'
2014-08-21 02:38:57 +02:00
5bf145a397
add a direct sendpartfullUpdate to send a full object update to a part,
...
optionally overriding its parentID. check what it does to attachments
2014-08-21 00:49:10 +01:00
ea1c232f92
revert droping udp packet resends after 6 retries, keep resending.
2014-08-21 00:08:43 +01:00
88587b4e73
reserve updates priority queue 2 for attachments, send them by it on
...
BestAvatarResp scheme. Attachments cannot be sent on imediate queues,
since they will block everything. Changed distance to priority math,
keeping identical result, shifted to start at queue 3.
2014-08-20 21:41:16 +01:00
542118adf1
remove from use the UpdatesResend on resending udp packets. Just resend
...
the UDP packet. Also just loose packets we tried to send 6 times already
(ll says 3) A viewer may just beeing ignoring them, or then the link is just dead.
2014-08-20 18:55:06 +01:00
16cf3967b4
Reserve a extra localID for a presence ( it will be localID + 1 )
2014-08-20 17:54:23 +01:00
b21b6532b0
sending attachment kills before putting them back doesnt cover all cases
...
and seems heavy for viewers
2014-08-20 17:48:10 +01:00
24b4f6ad7b
Merge branch 'ubitworkmaster'
2014-08-20 04:39:48 +02:00
d16f7df673
also send attachment pre-kills on crossings
2014-08-19 20:33:26 +01:00
6aa60a5d97
test ....
2014-08-19 19:56:43 +01:00
cca2ae3c89
test
2014-08-19 19:47:41 +01:00
4e03d352c3
Extend drop command to "debug lludp drop <in|out>..." to allow drop of inbound packets.
...
For test/debug purposes.
2014-08-19 18:43:21 +01:00
298376d5c7
Add "debug lludp drop out <add|remove> <packet-name>" console command for debug/test purposes.
...
This drops all outbound packets that match a given packet name.
Can currently only be applied to all connections in a scene.
2014-08-19 18:34:17 +01:00
919aef1573
send zero velocity again on avatar full update or its ugly
2014-08-19 10:03:04 +01:00
ca43a7fe63
variationsss...
2014-08-19 09:42:45 +01:00
b0253362c7
remove the silly sendTerseUpdates. I was fooled by wingridproxy not
...
decoding updates correctly
2014-08-19 09:18:29 +01:00
8f0d35e59a
fix the encoding of rotation in updates, not just using the next field to
...
override w bytes. ( specially having it commented )
2014-08-19 09:04:20 +01:00
e883fb519b
test
2014-08-19 06:53:02 +01:00
65983cc4fc
test
2014-08-19 06:23:30 +01:00
1c9af8727d
send the avatar data after sending attachments, by the same Entity updates
...
path
2014-08-19 05:13:18 +01:00
42a58101cf
HACK force GetPriorityByBestAvatarResponsiveness ignoring configuration
2014-08-19 04:56:33 +01:00
9914e371af
minor changes to GetPriorityByBestAvatarResponsiveness code
2014-08-19 04:54:25 +01:00
505cbf9983
still another ...
2014-08-19 03:58:16 +01:00
4c46ebdbf5
fix a missed blocking of sending updates the the new attach points above
...
hud indexes
2014-08-19 03:47:26 +01:00
e77fafe12d
*test* send attachments in sync, resend avatar at end
2014-08-19 02:15:01 +01:00
88b2fc61ff
Add clientstack.<scene>.OQRERequestsWaiting stat
...
Only present if OQRE is enabled
2014-08-19 00:42:19 +01:00
84cea46c10
Add experimental OutgoingQueueRefillEngine to handle queue refill processing on a controlled number of threads rather than the threadpool.
...
Disabled by default. Currently can only be enabled with console "debug lludp oqre start" command, though this can be started and stopped whilst simulator is running.
When a connection requires packet queue refill processing (used to populate queues with entity updates, entity prop updates and image queue updates), this is done via Threadpool requests.
However, with a very high number of connections (e.g. 100 root + 300 child) a very large number of simultaneous requests may be causing performance issues.
This commit adds an experimental engine for processing these requests from a queue with a persistent thread instead.
Unlike inbound processing, there are no network requests in this processing that might hold the thread up for a long time.
Early implementation - currently only one thread which may (or may not) get overloaded with requests. Added for testing purposes.
2014-08-19 00:17:12 +01:00
b375f86f11
Make LLUDPServer.Scene publicly gettable/privately settable instead of protected so that other logging code in the clientstack can record more useful information
...
Adds some commented out logging for use again in the future.
No functional change.
2014-08-19 00:17:12 +01:00
ffcc1d7fa2
undo the hack.. its useless
2014-08-18 23:14:04 +01:00
321816b32c
Prevent exception if inventory item in llGiveInventory() call doesn't exist.
2014-08-18 16:00:49 -04:00
d31f361e89
moved hacks to scene presence completemovement, possible only needed
...
there?
2014-08-18 19:41:16 +01:00
73b8dc4183
missing file for previus commit
2014-08-18 19:19:25 +01:00
83e545df93
*DANGER* *HACKS* on reusing child presences: partA send kills to
...
viewers, partB keep using same localID (as before)
2014-08-18 19:14:53 +01:00
4f7acc4c2c
Expect a missing directory, the asset cache is shared. Prevent spew if
...
two nodes run cleanup at the same time.
2014-08-18 17:14:51 +02:00
96de2a2fd2
reduce the kills sent, hide attachments kills on origin
2014-08-18 04:07:40 +01:00
f8e4805d98
NOT GOOD. Changed hide code on crossing/tp. Send needed avatar and attachments
...
kills, visible so we can see what is going on, to try to improve later
(this are always needed, hidding just made issues more visible )
2014-08-18 01:34:16 +01:00
31a2c07e83
put bake bakes, plus a missing change forcing animations to pass by
...
scenepresence
2014-08-17 09:54:38 +01:00
7ce32d717a
TEST disable again baked textures on crossing
2014-08-17 07:57:26 +01:00
d3b3822006
TEST DANGER InformClientOfNeighbourAsync do nothing unless a newagent
2014-08-17 07:32:24 +01:00
8d11b96cd9
*DANGER* rearange EnableChildAgents() so that hopefully it does it job
...
better, like not telling clients to log on regions where they are already
child
2014-08-17 05:59:14 +01:00
99a87f18c0
bad test
2014-08-17 04:24:55 +01:00
722b3a6523
make EnableChildAgent async from caller
2014-08-17 03:22:05 +01:00
4a20760929
remove hack to break sending of baked cache on agent cross update
2014-08-17 02:26:35 +01:00
90987a5484
DEBUG intencional break of sending baked cache
2014-08-16 22:56:56 +01:00
f8b8cf3d8f
more detailed timing on completmovement
2014-08-16 22:16:15 +01:00
f6642a1cc8
minor low resolution debug timming
2014-08-16 21:53:45 +01:00
21b3980d2b
send avatar Height to children, use it in region tp height check
2014-08-16 21:46:25 +01:00
dc178959c5
change how avatar data, appearance and animations are sent, specially
...
the order
2014-08-16 14:52:09 +01:00
1edaf29149
NextAnimationSequenceNumber be a udpserver variable with random start
2014-08-16 13:43:26 +01:00
7d967c37f4
*test* just send default appearance ( something along path doesnt like
...
null there )
2014-08-16 00:25:27 +01:00
0720c201b2
on teleports dont send baked textures assets in CreateClient, they will do on the update sent next
2014-08-15 23:01:54 +01:00
e0c6bfa81e
If a user moves back in sight of a child region before the agent has been closed on teleport, don't unnecessarily resend all avatar and object data about that region.
2014-08-15 21:47:34 +01:00
91e1aaa5d4
On teleport to a region that already has a child agent established (e.g. a neighbour) don't resend all the initial avatar and object data again.
...
This is unnecessary since it has been received (and data continues to be received) in the existing child connection.
2014-08-15 21:47:34 +01:00
72a6bca033
cleanup a bit
2014-08-15 21:26:50 +01:00
3e6f49f3be
do CrossAttachmentsIntoNewRegion for old versions in the right place
2014-08-15 19:21:32 +01:00
a3e45a45bc
refix hide on crossings
2014-08-15 19:05:27 +01:00
4d770082d5
let failed crossing say something abotu reason
2014-08-15 18:06:04 +01:00
1314a02a95
adjust createAgent delay on childs creation. Beeing bad, it should be high
...
enougth to reasonable account for grid and region lag spikes
2014-08-15 17:44:24 +01:00
117d563fd4
remove ban check from create caps. That needs to be done on caller
...
(scene.NewUserConnection()) acording to cases, and with minimal calls to
external grid services.
2014-08-15 17:24:01 +01:00
b4a7126167
remove the delay on child creation on Neighbour since its amout in not
...
predictable.
2014-08-15 01:22:15 +01:00
f798f04686
add a extra delay in EnableChildAgents between CreateAgent() return and
...
telling client to connect, to account for potencial async tasks that need
to finish before the client knocks at the door. Empirical value used
2014-08-14 22:03:41 +01:00
0ae8fed4c2
reduce ping cliping lower limit
2014-08-14 21:18:58 +01:00
538a95ff1e
in show connections show also if it is a childagent connection
2014-08-14 21:05:17 +01:00
a46d6004df
reduce ping filter time constant
2014-08-14 21:04:30 +01:00
8c657e4837
add a estimator of client ping time, and painfully make it visible in show
...
connections console command
2014-08-14 20:41:36 +01:00
d64fb216d2
try external bakedModule when local cache is invalid and not just at login
2014-08-14 15:39:46 +01:00
ca28062722
dont mess with Throttles in code also used to send to main regions. Use
...
full parameters on appearance cloning so its clear we want it all
2014-08-14 12:34:07 +01:00
626536b8cc
Added RestrictEmail to make llEmail only send to avatars email address if true.
2014-08-14 02:40:06 -04:00
96cc4e5b95
reduced debug msgs
2014-08-14 04:01:54 +01:00
ab4df26309
only try external baked texture module on login
2014-08-14 03:47:18 +01:00
395903d58f
*DANGER* dont send baked textures assets to Neighbours. Possible we could
...
send a lot less
2014-08-14 02:36:50 +01:00
a1cc218f10
*DANGER* make baked textures cross and make use of it * UNTESTED *
...
issue: alll this seems to be sent back to childs, need to stop that
2014-08-14 01:53:51 +01:00
4c781db572
Make RootTerseUpdatePeriod and ChildTerseUpdatePeriod configurable in [InterestManagement] in OpenSim.ini for experimental purposes.
...
If n > 1 for RootTerseUpdatePeriod only every n terse update is actually sent to observers on same region, unless velocity is effectively zero (to stop av drift).
If n > 1 for ChildTerseUpdatePeriod only every n terse update is sent to observers in other regions, unless velocity is effectively zero.
Defaults are same as before (all packets are sent).
Tradeoff is reduction of UDP traffic vs fidelity of observed av mvmt.
Increasing n > 1 leads to jerky observed mvmt immediateley for root, though not on child, where experimentally have gone to n = 4 before jerkiness is noticeable.
2014-08-14 01:39:26 +01:00
6ea82ad48a
Make some existing reprioritization values changeable outside the scene for test purposes, and use more consise property syntax.
...
No functional change.
2014-08-14 01:16:58 +01:00
bc0895c758
On entity transfer of scene presence, replace polling sleep in SP.WaitForUpdateAgent() with a triggered event instead.
...
Rapid polls are more expensive than triggered events (several polls vs one trigger) and may be problematic on heavily loaded simulators where many threads are vying for processor time.
A triggered event is also slightly quicker as there is no maximum 200ms wait between polls.
2014-08-13 23:45:51 +01:00
0d2a25b477
Remove redundant origin region lock in SP.CompleteMovement()
...
This is already going to be correctly set by WaitForUpdateAgent() earlier on in that method, which is always called where a callback to the originating region is required.
2014-08-13 23:11:32 +01:00
0db6f3a2bd
Only set up the UnackedMethod for an outgoing message if that message is actually meant to get an ack (because it's reliable).
2014-08-13 22:57:14 +01:00
1bd13155e6
put back baked textures debug msgs at start of validatebaked...
2014-08-13 20:43:26 +01:00
483afe6867
remove creative hack and try to fix
2014-08-13 18:52:13 +01:00
3f0138c967
Merge branch 'master' into ubitworkmaster
2014-08-13 15:50:12 +01:00
92117d48af
remove the region where we are root from the list of Neighbours and
...
childSeeds
2014-08-13 03:54:13 +01:00
444b41b22a
reverted last change since it did nothing usefull
2014-08-13 03:11:55 +01:00
0a1ffad07c
TEST do a Animator.UpdateMovementAnimations() when making root ( in
...
validate appearence just before sending animation
2014-08-13 03:01:49 +01:00
b96f951a6a
Merge branch 'ubitworkmaster'
2014-08-13 03:05:54 +02:00
ecae45a21e
Revert "make HandlerRegionHandshakeReply processing async and delay it a bit. This"
...
This reverts commit 30f00bfb14
2014-08-13 03:05:25 +02:00
cf48b814eb
remove HandleCompleteMovementIntoRegion delay hack from llUDPserver. If we
...
need a delay, we need to do it at end of HandleUseCircuitCode before
feeding pending packets (including that one) into processing queue.
2014-08-13 01:42:16 +01:00
0760fa3106
process AgentUpdates in order with rest of packets. Only give higher priority to chat
2014-08-13 00:17:03 +01:00
20b3cab5d1
take agentUpdate checks out of llUDPserver (disabling useless debug) and
...
do it only where its supposed to be done..
2014-08-12 23:57:41 +01:00
f811efde85
do the significance test invalidation at MoveAgentToRegion
2014-08-12 22:36:17 +01:00
b9224a70c4
no need to go from cos into squared sin when just abs of cos is as good
2014-08-12 22:27:50 +01:00
dbbfaf3ac3
force AgentUpdate after CompleteAgentMovement to pass by significance test
2014-08-12 22:17:15 +01:00
96d89c5906
Merge branch 'ubitworkmaster'
2014-08-12 22:46:28 +02:00
bf269c871a
use Vector3.normalize in place of util.GetNormalize
2014-08-12 20:59:36 +01:00
c7e3e59953
try no send current LookAt, remove redundant incomplete position height
...
check
2014-08-12 20:37:34 +01:00
4997a9e87a
fix VS creative indentation
2014-08-12 18:42:18 +01:00
a0f26dc6ec
change XMLIrpgGroups attach to events, using the more correct
...
\addons\Groups\... model
2014-08-12 18:28:01 +01:00
37921c66e5
Avination's Dynamic Floater Module. This works with Singularity viewer only.
...
It's WIP in that a dialog builder is on it's way. For now, the XML needs to
be handmade.
2014-08-12 01:04:29 +02:00
22d472e34a
Merge branch 'ubitworkmaster'
2014-08-11 18:45:39 +02:00
2cc8e90bd2
remove a land.SendLandUpdateToClient() since its now done for all cases in
...
completmovement and not only that specific one
2014-08-11 02:51:34 +01:00
ba33d78af9
dont do ParcelCrossCheck() on child avatars
2014-08-11 01:44:12 +01:00
0eaabef1dc
Fix a condition check
2014-08-11 02:31:29 +02:00
519df0d2a3
Fix a condition check
2014-08-11 02:30:09 +02:00
036017bba7
Make texture anims work right on singu
2014-08-11 02:08:17 +02:00
01e381fa33
Make texture anims work right on singu
2014-08-11 02:07:23 +02:00
e860dd33fa
remove confusing defonly control
2014-08-11 00:54:30 +01:00
306875fc61
... one day..
2014-08-11 00:49:11 +01:00
9217d5ca31
will get there..
2014-08-11 00:44:34 +01:00
0a9925ff4a
validatebaked still not ok
2014-08-11 00:28:14 +01:00
67a91ee314
make sensors detect sitting avatars also by the distance to the root prim
...
of the object as sl does (as sl avatar needs to be in the arc)
2014-08-10 22:13:39 +01:00
0e809ab265
LSL llListFindList fix: check types as well as content. Items must be same type
...
to be found.
2014-08-10 22:01:39 +02:00
4707c48828
LSL llListFindList fix: check types as well as content. Items must be same type
...
to be found.
2014-08-10 22:00:01 +02:00
7fcd1068e7
TEST move parcelRegionCross to EntityTransferModule cross so it works on
...
sitting avatars. (may be bad) comented out sending root avatars
information to the child that was just a root it should have it all
already. Dont turn a sitting avatar physical, that needs to be a stand at SOG
2014-08-10 20:09:02 +01:00
c0378d5430
actually let delay match throttles as original design
2014-08-10 16:36:20 +01:00
ebc18a80bf
OutgoingPacketHandler can not be paced by hits on SendPacket()
2014-08-10 14:49:58 +01:00
c84a3c3630
also on other case
2014-08-09 16:22:46 +01:00
601c50dc1e
return even zero costs ( prims on other regions )
2014-08-09 16:19:07 +01:00
2eb1c1c377
move from RegisterInventoryServiceHandlers to
...
RegisterRegionServiceHandlers what belongs there ( readabilitly only )
2014-08-09 15:15:27 +01:00
dc7b9c1cc3
dont do for children what is for growups ( root agents) ( needs check)
2014-08-09 15:12:02 +01:00
8738445eb7
Move the inventory request lock introduced in git master a58152bd to HGInventoryBroker to preserve that behaviour there but allow 2 simultaneous inv requests (chiefly WebFetch) rather than 1
...
This lock serialized all requests and made the inventory throttling in WebFetch redundant.
By moving this lock, two simultaneous requests may now take place which may help with http://opensimulator.org/mantis/view.php?id=7054
2014-08-09 00:52:51 +01:00
30f1b424bb
Change RootRotationUpdateTolerance from 0.01 to 0.1 in code as well.
2014-08-08 23:47:53 +01:00
36f01dce2d
Change MaxPoolThreads default in code as well from 15 to 300
2014-08-08 23:47:03 +01:00
ebbf236abc
of course.. bug..
2014-08-08 02:25:31 +01:00
9aa6389b8b
lock set appearence during ValidateBakedTextureCache there seems to be a
...
overlap in same cases
2014-08-08 02:22:18 +01:00
2a457c862e
Merge branch 'master' into ubitworkmaster
2014-08-08 00:52:41 +01:00
5628c0bcd6
Reduce delay time on regin handshake reply to speed up terrain sending.
...
Terrain IS more important than avatar!
2014-08-07 23:54:38 +02:00
73cbdf2c6b
bug
2014-08-07 22:00:23 +01:00
6d372f3d9e
remove annoying debug msg . still a lot of spam, but to remove later
2014-08-07 21:37:11 +01:00
f788947594
make grid baked textures override the ones on appearance. Due to bug
...
somewhere they are always bad at ValidateBakedTextures entry. ( even if
they where good and on assets cache we whould need to generate the
cacheID hash )
2014-08-07 21:24:52 +01:00
38e2e5942c
bug on upload new bakes decision
2014-08-07 19:16:51 +01:00
dfa9ba0937
minor clean, dont check for cache if we aren't using it..
2014-08-07 08:47:03 +01:00
1408c9eee7
reply to cached checks with same serial number
2014-08-07 07:55:56 +01:00
a95afb7fc5
bug
2014-08-07 07:36:23 +01:00
12d8ed2dcd
only send to bakedmodule the baked textures :)
2014-08-07 07:08:01 +01:00
b7f24bacce
bugg
2014-08-07 06:09:56 +01:00
c3f9c99fb3
DANGER... changed bakedtextures caching. Assuming grid baking is cache
...
only, reduced number of accesses to it. TESTING
2014-08-07 05:20:45 +01:00
2924d250ab
Fix short help string for show region command.
2014-08-06 21:41:53 -04:00
10a8d2852e
OpenSimExtras
...
Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.
2014-08-06 17:25:12 -04:00
e36e416637
Fixed crash when using Allowed/Denied Viewers, and the viewer's name is shorter than one of the test strings
...
This fixes http://opensimulator.org/mantis/view.php?id=7294
2014-08-06 19:02:15 +03:00
552b4e45e8
bakemodule didnt like last changes
2014-08-06 05:56:10 +01:00
66dea8fe05
some debug to remove later
2014-08-06 05:17:30 +01:00
bd3d58dd00
try to make the baked textures cache work
2014-08-06 04:54:14 +01:00
78ccadb27e
Add RootPositionUpdateTolerance, RootRotationUpdateTolerance, and RootVelocityUpdateTolerance parameters to [InterestManagement] in OpenSimDefaults.ini
...
These govern when AgentUpdates are sent to observers on position, rotation and velocity changes to an avatar (including the avatar themselves).
Higher values reduce AgentUpdate traffic but at a certain level will degrade smoothness of avatar and perceived avatar movement.
2014-08-06 00:53:14 +01:00
961cb9cc77
refactor: Rename recent new Client*UpdateTolerance to Root*UpdateTolerance for better accuracy and consistency with other similar parameters
2014-08-06 00:35:26 +01:00
e1a5a1f829
apply objectSlamSale to all roots of coalescence objects. replace the
...
single object condition for renaming
2014-08-05 23:25:08 +01:00
3c321e5bb3
dont mess with names and descriptions on coalescence objects. Inventory
...
name can change for inventory purposes only.
2014-08-05 22:49:41 +01:00
2c4908578e
revert to old avn-current code, not using ApplyPermissionsOnRez() till its
...
reviewed/fixed
2014-08-05 21:55:42 +01:00
31b5a587a4
Merge branch 'master' into ubitworkmaster
2014-08-05 19:28:56 +01:00
c80322f1e6
dont change agentItem.BasePermissions where avination-current didn't
...
change
2014-08-05 19:03:11 +01:00
dc2471fedd
Fixed premature closing of the connection in DataSnapshotManager
2014-08-05 19:09:11 +03:00
d6890d78ad
Make currently unfiltered EventQueue log messages only appear now at DebugLevel 1
...
This covers event queue setup messages and some outgoing messages (e.g. EnableSimulator)
In my experience these messages are only useful if you really know what they mean and you're looking for them
Otherwise, they're quite spammy.
Event queue DebugLevel 1 is enabled with the "debug eq 1" console command
2014-08-05 00:52:04 +01:00
507a29d581
diference fix
2014-08-04 21:55:58 +01:00
3cca5ec667
check...
2014-08-04 21:52:29 +01:00
3d81f25e34
Revert "start sending terrain in scenePresence after well defined avatar. Minor"
...
This reverts commit 05a2feba5d
2014-08-04 20:32:11 +01:00
05a2feba5d
start sending terrain in scenePresence after well defined avatar. Minor
...
change on significante AgentUpdate check.
2014-08-04 19:57:47 +01:00
8cf945544c
local chat gods bug fix
2014-08-04 00:43:57 +01:00
b07b0ff555
missing child login parcel overlay
2014-08-04 00:16:56 +01:00
14250c776a
missing currentParcelUUID update
2014-08-03 23:44:51 +01:00
bad01fbb41
some mess cleanup
2014-08-03 22:57:08 +01:00
0d71a2bb8f
mess update ( hide avatars )
2014-08-03 22:38:50 +01:00
21aa325883
remove debug msgs at attachments deRez
2014-08-03 19:41:48 +01:00
6b3f10790e
bugg
2014-08-03 19:35:16 +01:00
c2d9a6499a
dont get script states for NPCs on deRez
2014-08-03 19:08:13 +01:00
ca8b0e6a1d
replace debug msgs by others
2014-08-03 19:00:01 +01:00
ed47874197
several debug msgs, need to be removed asap
2014-08-03 18:22:00 +01:00
1a407e2545
Stop deleting objects that have status DIE_AT_EDGE set when they cross regions.
...
This was an OpenSim hack to prevent vehicles from trying to cross.
2014-08-03 17:32:34 +02:00
bcab663ad7
debug...
2014-08-03 06:16:30 +01:00
cc16fe68cc
....
2014-08-03 02:26:39 +01:00
b9443b186e
test...
2014-08-03 02:09:07 +01:00
53e95803a5
test not rezzing attachments on a FireAndForget
2014-08-03 01:20:34 +01:00
9f5e19127d
comment out a debug msg. more on gods being Gods
2014-08-03 00:22:21 +01:00
addca0737c
testing...
2014-08-02 23:38:18 +01:00
009e8ee76c
testing
2014-08-02 23:04:18 +01:00
e87f70e277
god also read local chat
2014-08-02 22:45:28 +01:00
580604c231
let gods see hidden avatars ( test )
2014-08-02 22:32:51 +01:00
35616339f3
remove the groups restrictions for npcs since they do nothing usefull
2014-08-02 21:01:44 +01:00
46da95d1b7
bug hunt: disable group for npc
2014-08-02 19:33:38 +01:00
01981fdf58
dont fire a thread on npc creation keeping the main one just waiting
2014-08-02 18:57:43 +01:00
74447d14cd
add some filters for NPCs
2014-08-02 18:32:28 +01:00
b0864a2f0f
crossing into a hide parcel may work now. Not nice fix.. need get back to
...
this later
2014-08-02 14:17:00 +01:00
de3421b408
Fix typo in log message
2014-08-02 08:21:25 -04:00
20eeeba0d2
initial state change
2014-08-02 03:17:39 +01:00
c11c4c0daa
add a hide check at end of region arrival
2014-08-02 02:26:54 +01:00
46add98071
remove a few more
2014-08-02 01:45:32 +01:00
bdac5058c8
remove some ischild tests
2014-08-02 01:21:24 +01:00
7cec4997db
Fix regression in SimulatorFeatures module that would stop OpenSimulator from starting if no [SimulatorFeatures] section was present in config.
2014-08-01 20:29:25 +01:00
e296f25445
sitting avatars hidding by their position. This is not as SL that uses
...
avatar sitting on root prim. All cases have good and bad situations, this is
simpler. Only SOG position changes triggers checks, rotation alone will
not. ( as happens in other cases ) (UNTESTED, as usual )
2014-08-01 19:52:55 +01:00
ef1f37cf20
handle change of hide avatars flag. Parcel limits edition still need work
2014-08-01 18:59:08 +01:00
cb43dff2dc
remove unnecessary sendparceloverlay
2014-08-01 02:55:34 +01:00
e5f9f064a7
filter local chat from avatars or attachment acording to parcel hide (
...
not fully tested)
2014-08-01 01:43:12 +01:00
0a1e9d731d
work on hide avatars
2014-08-01 00:34:52 +01:00
cac910d401
Add region-side extra feature setting for destination guide
2014-07-31 08:20:06 -04:00
50ed97aa1a
BulletSim: thread safe handling of list of avatars.
...
Fix for 7284 which is an enumeration exception when starting up a region.
2014-07-30 21:49:57 -07:00
a5e9429f2b
MESS: changes in MakeRootAgent and CompleteMovement reordering things.
...
Added sending of land overlay and parcel information. This in order to
only send avatar related information after having its position well
defined and on the right parcel. THIS MAY STILL BE BAD :)
2014-07-31 03:10:50 +01:00
30f00bfb14
make HandlerRegionHandshakeReply processing async and delay it a bit. This
...
delays things like terrain height map sending, giving chance to
completemovent to send more priority information. POssible things on this
should be on other event trigger when its more apropriate
really done.
2014-07-30 21:11:11 +01:00
17f9f1c247
restrict other avatar sounds to parcel flags ( untested )
2014-07-30 16:32:25 +01:00
e0d8f42e6b
Simulator Extra Features Service
...
Provide a means for regions to fetch extra features supported by modern viewers from a central location
.
2014-07-30 11:24:39 -04:00
2a2a772408
mute avatar collision sounds if parcel doesnt allow
2014-07-30 15:36:49 +01:00
5fe1f87837
changes to parcels code (still more to to)
2014-07-30 14:53:56 +01:00
a4107cb6c7
In TerrainModule, lock m_perClientPatchUpdates when removing entries.
...
This may have been the trigger CheckSendingPatchesToClients() dictionary out of sync exceptions in today's load test.
Don't need to check ContainsKey() since Remove() returns false on a request to remove a key that it doesn't have
2014-07-29 23:39:10 +01:00
fcf5fb5dfd
Implement "scene debug set root-upd-per" for dropping 1 in N root agent updates except to originator
...
For experimental purposes.
Also corrects a previous bug where each terse update sent was counted rather than each set of terse updates to agents.
2014-07-29 18:54:16 +01:00
0f87a99e54
Add debug mechanism for only sending 1 in N AgentUpdate packets to child agents.
...
Allows experiments in manually reducing updates under heavy load.
Activated by "debug scene set client-upd-per" console command.
In a simple test, can send as few as every 4th update before observed movement starts becoming disturbingly rubber-banded.
2014-07-29 18:09:11 +01:00
6a0be97974
Correct nomenclature for LLSD messages. LL sure suck
2014-07-29 05:06:53 +02:00
0c2537bb24
Try to plumb the other half
2014-07-29 04:41:38 +02:00
5cd21516a4
Add "debug scene set appear-refresh true|false" to control whether periodic appearance refresh is active.
...
Corresponds to ResendAppearnceUpdates setting in [Appearance] in OpenSim.ini
This was originally implemented to alleviate cloud appearance problems but could be too expensive with large numbers of avatars.
2014-07-29 03:26:14 +01:00
dfa9780c8c
Send new parcel permissions to activate viewer options - done right this time
2014-07-29 04:19:01 +02:00
f54fccba1e
Make it possible to change avatar position update, rotation and velocity tolerances on the fly.
...
This is done via "debug scene set client-pos-upd, client-rot-upd, client-vel-upd".
For testing purposes.
2014-07-29 03:13:10 +01:00
477b5b5623
Add new fields to parcel update
2014-07-29 03:40:05 +02:00
181142c5ce
Change some ORs to assignments as they should be
2014-07-29 02:37:36 +02:00
6b0521d3c9
fix the mess about exclusive fields and flags on land overlay
2014-07-29 01:24:43 +01:00
3654ae8d8c
Allow the "debug scene set physics false|true" command to work when bulletsim physics is running in a separate thread.
...
This will also allow the "disable physics" setting in the region debug viewer dialog to work in this circumstance.
2014-07-29 01:21:15 +01:00
3e1d2df261
change parcel overlay bytes adding LocalSound.. changed others also NEEDS
...
checking
2014-07-29 00:39:08 +01:00
df816b38ac
minor: make "debug scene set" usage command accurate again from last commit f6f7585
2014-07-29 00:20:35 +01:00
f6f7585ec5
Add a "debug scene set child-repri <double>" command that allows child reprioritization distance to be changed on the fly.
...
This governs when child agent position changes are sent to neighbouring regions.
Corresponding config parameter is ChildReprioritizationDistance in [InterestManagement] in OpenSim.ini
For test purposes.
2014-07-29 00:13:29 +01:00
f32bd24a2c
dont mess with sound gain on stop
2014-07-27 17:03:53 +01:00
55df2b317c
dont send packets twice
2014-07-27 12:02:59 +01:00
c3b5a6c2ab
change how sounds work. May be bad.. needs testing
2014-07-27 08:18:27 +01:00
5a7a609683
remove forgotten lines
2014-07-27 08:11:27 +01:00
eb55e69d4a
serialize sound parameters for llLoopSound
2014-07-27 08:08:01 +01:00
9c804466e5
BulletSim: rearrange code for sensing whether shapes have been
...
constructed.
Add routine to check for failed and use that method rather than
checking individual state.
2014-07-26 16:03:43 -07:00
43cf184603
clear script controls on crossing (untested)(possible should be done
...
elsewhere/othe way)
2014-07-26 16:56:21 +01:00
b6af41ec11
dont standup avatar on crossing
2014-07-26 05:59:38 +01:00
4aa55204a2
allow reset default animation to default as core does
2014-07-26 05:27:36 +01:00
70890e211a
add queue transition code needs review/more testing
2014-07-25 17:33:01 +01:00
fa59cddc28
remove old and dead code that its only making it hard to understand
2014-07-25 13:03:40 +01:00
cc61681484
Revert "Write UDP statistics to the log, not just the console (e.g., "show queues")"
...
Fixes http://opensimulator.org/mantis/view.php?id=7280
It can't be done this way because the stats data needs to show up on the console at all log levels, not just debug.
But this means setting it to log at fatal, which is not appropriate for this stuff in the log.
I understand the desire but this has to be done some other way, perhaps by (yet another) config parameter.
Also, this was already being done with the ClientStatsReport but that also should be done in another way, I think.
This reverts commit 5d53412766
2014-07-25 01:56:41 +01:00
86a9710e77
change previus code, send a NoEvents response back to http server, even
...
if we know there is no one there, so that the server finishes handling
it.
2014-07-24 23:32:39 +01:00
ee951f7a10
EventQueueGetModule: dont reuse queues, we dont know whats there; make
...
pool silently loose requests for unknown avatars, or they will stay active
until timeout after close ( possible not a big problem after not reusing
queues ? )
2014-07-24 17:14:14 +01:00
6c3e08e18d
revert my change of not adding physcis to a failed avatar transfer. This
...
may need a better fix later ( doing a stand elsewhere?)
2014-07-24 00:58:23 +01:00
9936f13c1b
on transfer fail of sited avatars, only do
2014-07-24 00:56:48 +01:00
46695ddbfe
fix line ending
2014-07-24 00:30:38 +01:00
8808549669
on sit use root prim camera at and eye if child as neither
2014-07-23 23:09:13 +01:00
f6af5f4996
change last commit setting intransit without messing flight
2014-07-23 22:28:51 +01:00
f9ae7ea2e6
do CompleteMovement with InTransit set as core
2014-07-23 21:14:35 +01:00
237075ce21
cleanup a bit presence CheckForBorderCrossing removing dead code
2014-07-23 20:31:54 +01:00
d64a50ac9b
changed locations of m_originRegionID setting to where current core has
...
them. Changed avatar AbsolutePosition, it still didnt assume m_pos as
relative to root prim. ( forgot to commit before) ( this sit may still
have loose ends, specially around the use of OffsetPosition that is now
relative to root prim and was relative to prim)
2014-07-23 19:56:06 +01:00
0331159d2c
clamp avatar standup position within region
2014-07-22 21:34:21 +01:00
3a87cce2e0
Fix recent regression in 3c6becd5 where login or hg login to variable sized regions failed with outdated simulator message.
...
I forgot that a null 'their version' would not be passed over the wire and ends up as an empty string instead (like older simulators).
So instead pass through the correct simulator protcol version instead (SIMULATOR/0.3) when querying from login or hg login.
Also removes a debug console write for agent limit accidentally left in for the same commit.
Relates to mantis 7276
2014-07-22 18:04:28 +01:00
f394fabfc0
if sited avatar cross fails, dont add it to physics and dont mess scripts
...
(?)
2014-07-22 16:28:30 +01:00
fe900b28c6
CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, so
...
revert previus change assuming it didnt. remove a no longer needed else {}
2014-07-22 15:56:20 +01:00
ed905418b3
consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE and
...
RETURN_AT_EDGE from simulation
2014-07-22 15:47:42 +01:00
f9fdf26ec3
make ResetChildPrimPhysicsPositions only do what it is supposed to do and
...
not what AbsolutePosition does
2014-07-22 15:13:37 +01:00
cf132430ae
tell scripts about positions changes after they are actually changed
2014-07-22 14:50:17 +01:00
5269511339
dont try to cross with avatars on DIE_AT_EDGE or RETURN_AT_EDGE sog
2014-07-22 14:31:47 +01:00
0e4a9e35c7
bug fix. Child position got broken because first prim i parts array may
...
not be the root prim
2014-07-22 04:10:51 +01:00
3e73e96bef
fix HUD attachment update filter to allow avatar center etc
2014-07-22 01:49:42 +01:00
243499ea4e
send updates on selected attachments as sl ( warinin if reverted then a
...
fix is needed elsewhere since the changes are never sent)
2014-07-22 01:11:18 +01:00
0239c7ba1c
avatar collisions fix
2014-07-21 23:54:53 +01:00
3c6becd524
On login and first HG entrance to a foreign grid, perform query access checks before proceeding.
2014-07-21 23:53:33 +01:00
5cdd205ee7
change presence movetotarget avoiding trying to go undergroud or fly when
...
it can walk. ( still needs better code )
2014-07-21 21:31:48 +01:00
d9797b6478
change ava to ava collisions a bit
2014-07-21 19:16:23 +01:00
726490a994
bug fix
2014-07-21 19:15:51 +01:00
899bcb7acd
Fixed: after a Hypergrid teleport, attachments often either disappear, or appear both on the avatar AND as in-world objects.
...
Another manifestation of this bug is that after a Hypergrid teleport, when you click on one of the avatar's attachments the object doesn't show its name. This means that the viewer knows the attachment is there, but the simulator does not.
The problem was caused by treating Hypergrid teleports as if they're Logins (because the teleport flag ViaLogin is enabled).
This may fix: http://opensimulator.org/mantis/view.php?id=7238
This may fix: http://opensimulator.org/mantis/view.php?id=7220
2014-07-21 09:29:51 +01:00
feacae173e
Fixed avatar hovering above the ground. The avatar physics capsule was too tall.
...
This is related to http://opensimulator.org/mantis/view.php?id=7067 .
But that bug complains about BulletSim, and this fix is for ODE.
2014-07-21 09:27:57 +01:00
4804edf77f
Allow reading the BulletSim detail log while the sim is running
2014-07-21 09:27:57 +01:00
2d034e20c4
XBakes: store the assets only in the sim's local assets cache; not in the main assets server. Also, some cleanup.
2014-07-21 09:27:56 +01:00
4c5d7d4683
Fixed problems if an avatar tries to cross regions when the previous cross hasn't completed yet
...
This caused the client to stop responding, and even the simulators to have problems. The solution is to disallow crossing before the previous cross has completed.
2014-07-21 09:23:13 +01:00
b481711fa6
Added locking in AccessModule to prevent possible errors when shutting down a simulator that has >1 region
2014-07-21 09:19:05 +01:00
05cacf6eb6
Eliminated common but un-useful log messages
2014-07-21 09:18:20 +01:00
f94b3bbe0f
Minor: changed "existant" to "existent"
2014-07-21 09:15:05 +01:00
af3498efdb
In "show throttles", show the maximum drip rate. This shows whether a client is being throttled due to past poor performance.
2014-07-21 09:10:50 +01:00
5d53412766
Write UDP statistics to the log, not just the console (e.g., "show queues")
2014-07-21 09:10:19 +01:00
528704bc04
Added "debug packet --all" option, which changes the packet logging level for both current and future clients
...
The existing "--default" option only changes the logging level for future clients.
2014-07-21 08:31:20 +01:00
a57b4b81b9
Fixed the logic that decides if a packet was queued (it was reversed)
2014-07-21 08:31:09 +01:00
9fa8d84598
Eliminated some warnings
2014-07-21 08:30:10 +01:00
99ac770abb
Close streams immediately when we finish using them
2014-07-21 08:30:03 +01:00
72cead2920
Remove extremely spammy error message that isn't an actual error - user
...
ids queried may not exist, since LSL can use this as well, with
arbitrary ids
2014-07-20 23:58:46 +02:00
34c40a1e1a
Remove some already commented lines
2014-07-20 23:58:16 +02:00
c37a88d4f1
Fix LSL portions of sit positioning
2014-07-20 23:54:06 +02:00
719880a6ff
make sittarget camera relative to root prim
...
Please enter the commit message for your changes. Lines starting
2014-07-20 20:20:59 +01:00
b81187db5a
Set "[Terrain]SendTerrainUpdatesByViewDistance=true" by default.
...
This, by default, enables terrain patches being sent to each avatar
from the avatar away (rather than the old outside-in pattern), only
sending terrain patches within the avatars view distance (making
view loading quicker), and sending multiple terrain patches per
protocol packet (making terrain loading and editing quicker).
2014-07-20 10:56:52 -07:00
5f364dbed5
another change to standup
2014-07-20 16:09:34 +01:00
d6f56a4f99
change avatar standup code
2014-07-20 16:03:05 +01:00
a5fcc0c0c0
remove avn hack on sitted avatars positions
2014-07-20 14:47:35 +01:00
79aea3e588
physicsSit SendSitResponse also relative to parent prim
2014-07-20 09:21:00 +01:00
931434de87
fix physics sit for physical child prims
2014-07-20 09:15:29 +01:00
32b060a608
physics engine cannot change internal positions of linksets, at least not
...
in teaseupdates
2014-07-20 05:54:51 +01:00
b3068355bc
Merge branch 'ubitworkmaster'
2014-07-20 02:27:08 +02:00
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
bef76bf3c5
Fix duplicate attach message being sent to objects picked up from the ground
2014-07-20 01:52:26 +02:00
95f0d582a5
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:18:28 +02:00
5000a5c038
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:17:35 +02:00
07c0ee1fbf
Fix taking objects
2014-07-19 23:17:26 +02:00
e1b2ecdfdc
Merge branch 'avination-current'
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
95b89dd450
fix attachments
2014-07-19 22:18:12 +02:00
9654b81b2d
revert to capsule representation of avatar collider
2014-07-19 16:16:13 +01:00
738c60459c
BulletSim: Modify first and default vehicle vertical attractor to be feature complete with use of the Limit Roll Only Flag.
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-07-18 19:07:00 -07:00
4dc0aaa03f
minor: Add meters unit to water height console display
2014-07-18 23:57:33 +01:00
1bdf0bed9c
Add "show region" command which will show parameters for current region.
...
This shows static data (e.g. region agent limit) whereas "show scene" shows live data (sim fps, current prims, etc.)
2014-07-18 23:52:49 +01:00
6048dfcd71
In grid mode, add SuppressConsoleCommands flag to [GridService] so that we can stop misleading grid service only console commands from registering.
...
We need to do this because the simulator initializes and internal copy of the GridService in grid mode for internal purposes
2014-07-18 22:57:04 +01:00
f0853139d5
refactor: slightly adjust some code in ODECharacter.Move() to eliminate a condition check without changing the logic
2014-07-18 18:13:38 +01:00
cfbfca6447
With ODE physics, fix an issue where the avatar couldn't jump and then move forward when moving south or west.
...
Addresses http://opensimulator.org/mantis/view.php?id=5003
Thanks to UbitUmarov for this fix.
2014-07-18 18:03:30 +01:00
748fc66ef1
reduce avatar hover in basic ode plugin
2014-07-18 13:19:24 +01:00
d5e0437465
fix Xengine script instance load
2014-07-18 11:43:31 +01:00
1daec26ba0
BulletSim: rearrange code to prevent using null pointers when a
...
child mesh is not available when building a linkset.
2014-07-17 21:41:39 -07:00
e455374a4b
fix all instances of "non-existant" to "non-existent" (spelling mistakes) thanks Ai Austin for pointing this out.
2014-07-17 09:37:24 -04:00
8cd7ca568d
Change default script stop method to co-op instead of abort.
...
co-op should be more stable as it doesn't abort threads, which can trigger virtual machine instability
This change will be invisible to users as script DLLs are recompiled automatically where necessary, though the change won't take affect until the next simulator restart.
This change has no effect on existing script state.
If you want to continue using abort, set ScriptStopStrategy = abort in the [XEngine] section of OpenSim.ini
2014-07-16 22:58:38 +01:00
19d33c571d
Merge branch 'avination-current' into ubitwork
2014-07-16 16:22:32 +01:00
fc1bd4567d
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2014-07-16 16:16:37 +01:00
0c8f3dddd8
Use thread-safe version of .NET Random as the SDK class is not thread-safe.
...
As per http://msdn.microsoft.com/en-us/library/system.random%28v=vs.100%29.aspx , the .NET Random class is not thread-safe.
If called by multiple threads at once, methods may return 0.
Except for llRand(), other OpenSimulator code did not lock before calling a shared Random instance.
This commit adds a ThreadSafeRandom class that extends Random but does internal locking so that it is thread-safe.
This change is invisible to existing callers and the explicit locking in the llFrand() implementation is now redundant.
2014-07-14 20:08:11 +01:00
4e92b55231
Call RemoveScriptInstance when removing from inventory
2014-07-14 18:06:24 +01:00
2766bf3fef
minor: Move debug xengine script console command to Debug help section where other debug commands live.
2014-07-11 00:18:39 +01:00
15b38f0036
minor: further cleanup of old vb and yield prolog script engine references that were removed some time ago
2014-07-11 00:15:47 +01:00
d7b9260496
If [XEngine] ScriptStopStrategy is changed between abort and co-op, for the existing session use the previous strategy for that script rather than not starting the script at all.
...
We have to do this since we can't unload existing DLLs if they're all in the same AppDomain.
But we can still update the underlying DLL which will be used in the next simulator session.
2014-07-11 00:03:02 +01:00
6d3b409af2
refactor: use existing Compiler.CreateScriptsDirectory() (renamed to CheckOrCreateScriptsDirectory()) when checking that scripts directory exists on compile.
...
Code was identical apart from error logging, but if there are failures creating these directories then you'll be
seeing lots of errors anyway, and these will be more informative
2014-07-10 19:40:44 +01:00
fea18a909f
Fix bug in "show modules" comamnd that was showing shared modules as non-shared and non-shared as shared
2014-07-09 23:24:12 +01:00
bb9071e5f0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-07-04 16:28:58 -07:00
869191a51d
Small change to my previous commit: not so aggressive on the trigger, please.
2014-07-04 16:28:37 -07:00
b019fd5a95
Show region size column in simulator version of "show regions" console command
2014-07-05 00:20:39 +01:00
dac8703949
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-07-04 15:56:32 -07:00
78c155cd12
Instrument the UDP path of creating assets so that it triggers an asset post for users with different asset servers
2014-07-04 15:56:09 -07:00
4b73268cbd
minor: put standard 'category' in brackets at front of log messages from previous commit 3d70db4a
2014-07-04 23:48:37 +01:00
3d70db4a58
When uploading mesh objects with textures also create inventory items for uploaded textures.
...
This implements:
http://opensimulator.org/mantis/view.php?id=7250
2014-07-04 23:40:09 +01:00
6e0e35cd66
Include option to remove auto backup files older than given number of days. New property created to specify how many days to keep files for. Off by default, also made sure only oar files will be removed.
2014-07-04 23:32:13 +01:00
20b47fce07
Still log (but this time with warning rather than an exception) if we regenerate a new child caps seed for a region where we already have one.
...
I think it's still useful to know this to show up any errors early, but it's reasonable to still carry on rather than throw an exception.
Follow on from Diva's commit 9643792
2014-07-04 22:59:10 +01:00
82b875317b
On logout, delay the removal of AgentCircuitData until the very end, because that data structure contains important information about the agent that may be needed by modules.
2014-07-04 14:36:11 -07:00
60ad72357e
This fixes the bug related to rebooting neighboring varregions while avatars are logged in; the avies would not see the region anymore until they relogged. Same problem as before: inconsistent calculation of scope.
2014-07-04 11:45:30 -07:00
d99c8e68a7
It turns out that child agent management has had a bug for a while: there was an inconsistency in the scope between opening and closing child agents in neighboring regions. For opening (in EnableChildAgents), the region's DrawDistance was being used; for closing (in IsOUtsideView) , the viewer's (SP) DrawDistance was being used. This fixes this inconsistency, therefore eliminating bugs observed in TPs between, at least, neighboring varregions.
2014-07-04 10:13:53 -07:00
d0782c2bc0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-07-03 20:09:38 -07:00
9643792b34
Avoid an exception in creating child agents some times.
2014-07-03 20:09:16 -07:00
4ba396b81c
Temporarily disable new regression test TestLifecycle() until I have a chance to fix it
...
This was working for me locally because it was still picking up all my *.ini config files, which jenkins won't have in its test env
2014-07-03 00:30:42 +01:00
c3923a1aa6
Re-enabled TestLifecycle regression test logging so I can get some idea of why it's failing on jenkins but not locally
2014-07-03 00:01:47 +01:00
889194db63
Actually call Close() for shared region modules when the simulator is being shutdown.
...
Adds regression test for this case.
2014-07-02 23:49:25 +01:00
fe6dab7f13
minor: Change default max phys prim size in code to match OpenSimDefaults.ini
2014-06-28 00:20:09 +01:00
cd031d129a
minor: change allow script crossings default in code to true in order to match OpenSimDefaults.ini
2014-06-28 00:18:00 +01:00
9d2789aff8
add LSL constant PRIM_ALPHA_MODE
2014-06-27 16:06:03 -07:00
abf85b7f19
Bulletsim: Create AvatarTerminalVelocity to BulletSim like what ODE and SL has. Before this falling from really high caused the avatar to fall faster then the veiwer can handle and cause camera issues.
2014-06-27 23:34:34 +01:00
a93799d03b
add LSL constants PRIM_SPECULAR and PRIM_NORMAL
2014-06-23 20:06:22 -07:00
ca2379ee83
Bug fix in map teleports in varregions. The cherry was missing from the ice-cream Sunday: the packet itself was hardcoding the size of the region...
2014-06-21 15:38:38 -07:00
481b7c71c3
BulletSim: add some locking for collision lists to prevent collsions
...
from locking up when running BulletSim on a separate thread.
2014-06-20 21:42:08 -07:00
159fcbf150
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
527c2cdb1e
Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'
2014-06-21 00:23:11 +02:00
5908e7d0c2
Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'
2014-06-21 00:22:51 +02:00
711441f922
Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2'
2014-06-21 00:21:29 +02:00
c90b986d8b
Improved line map heuristics.
...
If the C# column can't be found in the positionMap (but the line can),
use the map immediately after it while correcting for the offset,
unless that results in an LSL position before the previous LSL position
in the positionMap.
The idea behind this heuristic is that in most, if not all cases C#
consumes more characters than LSL (for example LSL_Types.LSLInteger
instead of just 'integer').
Thus if the distance between the columns of two markers differ in
the C# and LSL file, the distance in the C# file will be larger.
Moreover, we can assume that every time this happens we will have
a marker at the beginning of the longer 'keyword', because those
keywords were generated by us in the first place.
For example:
C#: LSL_Types.LSLInteger f2(LSL_Types.LSLString s)
^ ^
1 2
will always have markers at the beginning of the long keywords
'LSL_Types.LSLInteger' and 'LSL_Types.LSLString'.
If an error is generated in between (for example at the beginning
of the function name 'f2') then the correct position is found
by using an offset relative to 2 rather than 1.
Note that a case where this isn't working correctly is
when the user adds extra spaces. For example:
LSL: integer f2( string s)
would still use the start of 'string' as reference and
then go backwards 3 characters only because the corresponding
C# still looks like
C#: LSL_Types.LSLInteger f2(LSL_Types.LSLString s)
^ ^
only 3 chars difference
and the reported error at 'f2' would be here:
LSL: integer f2( string s)
^
This can only be fixed by generating a mapping for 'f2' itself, or
generating a mapping whenever the amount of spaces is changed.
2014-06-19 23:52:51 +01:00
3fe9c7c49d
Fix looking up line number and colum when there is no exact match.
...
When a compile error reports a colum/error that is not an exact
match in the positionMap dictionary, the last position in the
map with a line number and position before the reported error
should be returned.
The old code had the following problems:
1) It returns l,c - which are line and column of the C# file, not LSL.
2) It doesn't set l to 'line' when the map has an entry with 'line'.
3) It sorts the map without taking columns into account, which may
result in a random order of the columns. With my mono implementation
the columns were reversed in order.
For example, if the map contains the following lines:
99,5,49,10
100,30,50,10
100,40,1,0
101,5,51,10
and a translation of 100,35 was requested,
then the old code would compare '100' with the keys in
the first column - setting l to that key while it is
smaller. Hence, l is set to 99.
Then it finds the key 100 and doesn't update l.
Because of the reversed sort order, it first compares
the column 35 with 40, finding that it is smaller
and therefore it stops; returning 99,1 instead of finding
the correct 100,30 entry and returning 50,10.
This patch causes 50,10 to be returned.
The remaining problems after this patch are:
1) The sorting might not be necessary at all.
2) The is code duplication (I fixed both instances,
but really there should be no code duplication
imho).
2014-06-19 23:52:51 +01:00
4651cd1f50
BulletSim: stop processing linkset child when it is discovered that the
...
child doesn't have a physical shape. Another attempt at fixing Mantis 7191.
2014-06-18 23:01:39 -07:00
f348928590
BulletSim: more tweeks to AliciaRaven's flying mods. Added parameters
...
AvatarFlyingGroundMargin and AvatarFlyingGroundUpForce set to 5.0 and
2.0 respectively which seems to give about the same action as in SL.
Also moved force addition to before the velocity to force computation
so the upward velocity is properly applied to the avatar mass.
2014-06-18 22:39:28 -07:00
3cbdf3bfe0
refactor: Simplify compilation result tests by factoring out common code.
2014-06-18 23:04:31 +01:00
7b2f125fb6
In compiler regression tests, setup and teardown structures for each test to avoid any possibility of inter-test inter-ference
2014-06-18 22:46:54 +01:00
a0d6705fe6
Fix issue with LSL jumps screwing up the C# compiler error -> LSL code position map and leading to invalid error line numbers/columns
...
This is because jump statement generation was mistakenly inserting its own line without updating the csharp positions in CSCodeGenerator.
This is Aleric Inglewood's patch in http://opensimulator.org/mantis/view.php?id=7195 but applied to opensim itself rather than the defunct code generation in opensim-libs. Thanks!
This patch also adds a regression test for this case from myself.
2014-06-18 22:24:36 +01:00
db0c41501c
Fix previous commit to ignore water height and allow flying underwater (swimming)
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-06-17 23:06:49 -04:00
ff892b5bcf
Add upward force to flight when close to the ground. Prevents current belly flop to the floor when flying with bullet physics and acts more like ODE and SL flight.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-06-17 21:47:36 -04:00
5450b1b024
Change assembly versions to 0.8.1
2014-06-17 18:37:15 +01:00
b59812b4e3
If MaterialsModule unexpected sees a part with DefaultTexture of null, log this with a warning.
2014-06-16 22:20:30 +01:00
4374ce9fbf
If processing a queued request fails up to the top of the stack, log the exception and move to the next request rather than terminate the simulator.
2014-06-16 22:11:34 +01:00
696df33e5c
In materials module, if a texture entry somehow has no default entry then don't try to extract materials data rather than throw an exception
2014-06-16 21:47:34 +01:00
c5f7184d1b
Behavior change: only local users can set home in any parcel of a grid. Setting it for foreign users does not make sense, since cntrl+shift+H always teleports them back to their original grid.
2014-06-15 16:29:25 -07:00
dcd8e74584
Manual change as per patch in mantis #7212 . (the patch failed to apply, but the fix was good) Thanks FreakyTech.
2014-06-15 07:26:27 -07:00
807fb8339b
Revert "Let HG users be gods too, if they have local permission to be so."
...
HG gods are not safe at this point. It's better to disallow this until
they can be made safe.
This reverts commit e86c765be3
2014-06-09 22:00:10 -07:00
e86c765be3
Let HG users be gods too, if they have local permission to be so.
2014-06-09 21:46:24 -07:00
3552cfb1a5
BulletSim: fix exceptions while rebuilding linksets with mesh children.
...
This should get around the exception reported in Mantis 7191 and 7204
by checking for the unbuilt child and rebuilding the linkset the next tick.
A warning message is output when this rebuild happens and this message is
clamped to 10 times in case there is a problem with a loop.
2014-06-08 09:03:38 -07:00
fe779128b0
Added simulation version compatibility check so that agents coming from 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer.
2014-06-06 11:04:53 -07:00
733763c4e2
Amend to previous commit -- write down the problematic Profile server URL.
2014-06-05 20:06:01 -07:00
5bb95a8a55
May fix mantis #7133
2014-06-05 18:59:30 -07:00
c1bdd22274
Fix AutoBackupModule and include option to skip saving assets.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-06-04 22:01:55 -04:00
0aa0dad478
Send multiple terrain patches per terrain update packet if terrain
...
draw distance optimization is enabled. Makes terrain editting a lot
snappier.
2014-06-01 19:23:49 -07:00
3aa99b9a7f
Fixes a permissions bug where a user with group powers to always rez was not being given permission to rez on group land.
2014-06-01 16:45:37 -07:00
94d0ae0d91
This may fix mantis #7200 , but I am unable to test because I don't have any old viewers around anymore.
2014-06-01 10:18:53 -07:00
0eaca7aafb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-06-01 10:06:59 -07:00
2ff9ea3f80
Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector.
...
Also added more packing/unpacking code.
2014-06-01 10:06:26 -07:00
0300ec45eb
Modifications to debugging printouts. No functional changes.
2014-05-31 12:19:51 -07:00
22dade6463
varregion: More tweeking to only sending patches within avatar draw distance.
...
Still has problems with child avatars.
2014-05-31 12:19:50 -07:00
db5a42ffac
varregion: send terrain patches from where the avatar outward if the parameter
...
[Terrain]SendTerrainUpdatesByViewDistance=true.
This tracks which patches have been sent to each client and outputs the
patches as the avatar moves.
2014-05-31 12:19:49 -07:00
d6f9f690e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-31 08:22:56 -07:00
bf5320eb26
minor: rename velocidyDiff -> velocityDiff
2014-05-30 22:21:13 +01:00
3c992b028c
minor: Add some commented out logging to ScenePresence.SendTerseUpdateToAllClients() which is extremely helpful when investigating presence update triggers.
2014-05-30 22:18:07 +01:00
a755c57b44
Fix issue with BulletSim avatar level flight jitter by commenting out RawVelocity update threshold for now in BSCharacter.UpdateProperties().
...
For some reason as yet unidentified (feedback?) a threshold above 0.4 here causes the RawVelocity to move between a lower and upper bound rather than remaining constant.
The RawVelocity increased until it triggered the threshold update, at which point it started to decrease until it again triggered the threshhold update.
This delta-v was enough to exceed the checks in ScenePresence.SendTerseUpdateToAllClients() and produce jittery avatar flight because of the fluctuating velocity.
With a threshold of 0.4 (or 0, as with ODE), the RawVelocity remains constant in BulletSim and so avatar flight becomes mostly smooth - remaining occasional glitches appear to be a result of errors in distance extraploation.
There are no obvious problems with commenting out the threshold.
Misterblue, if this is wrong or I've missed some subtlety here, please feel free to revert and/or correct.
The same considerations may or may not apply to object velocity updates.
2014-05-30 22:12:23 +01:00
0eede1467f
Moved these two estate-related interfaces to the projects where they belong.
2014-05-30 13:11:46 -07:00
8656b5e948
Fix bug where setting a parcel in a varregion for sale would make sale bitmap generation in WorldMapModule throw an exception on next startup.
...
This commit replaces the hardcoded region sizes in WorldMapModule.GenerateOverlay() with numbers pulled from m_scene.RegionInfo
2014-05-30 19:40:10 +01:00
9ca86664bb
Make RegionReady login disabled during initialization message a console messages instead of a warning message.
...
Same justification as earlier commit 996a6c2
2014-05-27 23:15:50 +01:00
5622cf68aa
In compiler tests, remove the ResolveEventHandlers after test exit
2014-05-27 18:47:42 +01:00
394ec508f6
Make CompilerTest add same AssemblyResolver as XEngine to see if this solves the issue with different AppDomain BaseDirectory in local and Jenkins test runs
2014-05-27 18:37:16 +01:00
bcaacb4e41
Temporarily print regression TestCastAndConcatString() script compile errors out to console to get a handle on what's going wrong.
...
Does not fail for me locally and I failed to notice this test was failing on Jenkins.
2014-05-27 18:19:08 +01:00
d131c57978
Update regression TestInventoryDescendentsFetch() to account for recent commit 1fa3a6f
...
This was hidden in continuous integration because of another regression test issue.
2014-05-27 18:14:36 +01:00
987c56984d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-27 10:13:43 -07:00
e19c830a6c
Fixes a bug where map search results pertaining to varregions would only send the SW-most corner of the varregions; the other areas, when clicked, would result a blue circle, meaning that the viewer didn't know about those areas. This is still not quite right, as all the areas appear to be in the same coordinates, but it's good enough for now.
2014-05-27 10:13:24 -07:00
fab0389cb1
BulletSim: add locking of PhysObjects while processing simulation
...
step updates and collisions. This is an attempt to fix a crash reported
by Justin when doing high velocity teleports.
2014-05-26 20:29:45 -07:00
d2877b9cd4
Don't report NPC presences.
2014-05-26 10:28:31 -07:00
33cc847c4a
When saving an OAR in "Publish" mode, also discard Group information
2014-05-26 15:33:13 +01:00
5aeaa7fcdd
Prevent login to a region if the Telehub or Landing Point are in a banned parcel
2014-05-25 15:37:28 +01:00
e68867c9b6
When taking an object into inventory, set the inventory item's "Next Owner" permissions according to the permissions of the items in the object
2014-05-25 15:35:00 +01:00
227685bea4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-23 16:20:04 -07:00
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
9bae636ff0
Fix issues where reported LSL compiler error line numbers do not match the script.
...
This is probably due to changes in the layout of the generated script preamble (using statements etc, ) in c8afc852
2014-05-24 00:12:23 +01:00
cf95b65c10
Get regression test TestUseUndeclaredVariable() functional again, though not yet enabled.
...
This reveals the position map problems and will make the fix (and subsequent continual checking) easier.
2014-05-23 22:29:47 +01:00
250ea09328
Reactivate regression test TestCastAndConcatString() in CompilerTests.
2014-05-23 22:12:49 +01:00
72c67c5091
Fix possible infinite recursion in MessageTransferModule.SendGridInstantMessageViaXMLRPCAsync() whilst preserving retry lookup behaviour.
...
This is based on heavily mikemig's original patch in http://opensimulator.org/mantis/view.php?id=7149
but instead of exiting after the first IM delivery failure to presence information retrieved from the presence service
it will retry the lookup until the result matches the previous lookup.
This is to deal with the case where the agent is sent an IM whilst they are teleporting.
2014-05-23 20:14:49 +01:00
5015b0b485
If one is sitting on a child with an unset camera-eye and so using one set in a root prim, the focus should remain on the root prim.
...
Matches behaviour just tested on the Linden grid.
2014-05-23 01:55:05 +01:00
c78a8271c4
Add any camera at compensation for sat upon child prims to any existing camera-at value, rather than replace.
2014-05-23 01:38:05 +01:00
fbed245596
Compensate camera-at and camera-eye for child prim rotation when sitting on child prim with camera-eye set
2014-05-23 01:34:02 +01:00
174df94172
If a script calls llSetCameraAtOffset() or llSetCameraEyeOffset() on a child prim and the root prim has no corresponding value set, then also set the root prim.
...
This matches behaviour just tested on the Linden Lab grid.
2014-05-22 23:58:28 +01:00
3fbaef9275
If the root prim has a camera-at or camera-eye setting and a sat upon child prim does not, use the root prim offsets.
...
This matches behaviour just tested on the Linden Lab grid.
2014-05-22 23:52:28 +01:00
16bf38e1ab
Fix issue where llSetCameraAtOffset() and llSetCameraEyeOffset() in non-root prims moved camera/focus to wrong position.
...
For non-root prim, eye offsets now need to be made relative to root prim if either camera-at or camera-eye are set.
Probably a regression since November 2013 when all sits were made relative to root prim to match viewer expections (and fix other bugs).
Addresses http://opensimulator.org/mantis/view.php?id=7176
2014-05-22 23:39:22 +01:00
f8b8241239
Add regression test for north-south chat across neighbour regions.
2014-05-22 20:28:26 +01:00
bffc9ad184
Extend regression TestInterRegionChatDistanceEastWest() to test out of range chat
2014-05-22 20:04:32 +01:00
15b50ae737
Extend regression TestInterRegionChatDistanceEastWest() to test in range chat both ways.
2014-05-22 19:55:34 +01:00
65a135f4d3
Simplify regression TestInterRegionChatDistanceEastWest() by making the child presence connection directly rather than routing through TestClient.
...
This code isn't relevant to this test and is already exercised by other tests.
2014-05-22 19:47:33 +01:00
1b156b7fe8
Add regression test for in-range chat between neighbouring regions from east to west.
2014-05-22 19:18:24 +01:00
b7c7293c7a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-22 10:16:19 -07:00
f7b2aa0f49
Fixed a problem with detaching attachments in situations where the user's asset server is not the same as the simulator's asset server. Unfortunately this still continues to be wasteful -- new assets are created every time an attachment is detached, but the process of storing the new asset goes through the InventoryAccess module, which does all sorts of checks regarding the users' inventory.
2014-05-22 10:16:01 -07:00
a1b291c889
Allow map searches for regions that contain the characters "!+|"
...
These characters are used as placeholders for other characters: ": /". But we should search first for the exact string the user entered, and only if that fails then replace the characters and search again.
2014-05-21 07:39:23 +01:00
5b433e101d
minor: Comment out currently unused log setup in TerrainCompressor
2014-05-20 23:59:08 +01:00
d93275745b
minor: Remove some unused fields in ScenePresence
2014-05-20 23:57:03 +01:00
32070fa5f4
minor: remove compiler warning in SceneObjectPartInventory
2014-05-20 23:54:49 +01:00
9479f64778
Fix issue where avatar and script chat could sometimes be heard from anywhere in neighbouring regions.
...
This was due to a silent uint overflow in ScenePresence.UpdateChildAgent() corrupting child agent positions
when the child agent was in a region with a greater x or y map co-ord than the root agent region
Probably introduced in beeec1chttp://opensimulator.org/mantis/view.php?id=7163
2014-05-20 23:52:07 +01:00
5ec3429843
On verbose groups messaging logging, count all operations in reported time when sending group messages, not just those after get group members and get presence status, as applicable
2014-05-19 23:01:48 +01:00
b46be88db6
Split verbose groups messaging logging into its own setting separate from that of the groups module.
...
This is to allow us to get useful information on messaging without being overwhelmed by the rest of groups debug.
Enabled with [Groups] DebugMessagingEnabled = true in config (default false)
Or "debug groups messaging verbose true|false on the console" (similar to existing groups setting).
Done for both xmlrpc and V2 groups.
2014-05-19 22:45:17 +01:00
3a6f312484
Fix recent regression from 77e7bbc where an attachment on a received group notice with XmlRpcGroups messaging did not appear in the user's inventory.
...
This was because the "session ID" when the message template was copied was always replaced with the group ID, whereas a notice requires this to be the notice ID.
Instead just copy the "session ID" as is - other callers already have this set properly so replacing with group ID was redundant anyway.
Relates to http://opensimulator.org/mantis/view.php?id=7037
2014-05-19 22:06:41 +01:00
47b84875fd
Tell QueryAccess explicitly whether the user is coming in via Teleport or Cross, because the permission checks are different.
...
Previously we used a heuristic of checking if the entry position is 0 to differentiate between Teleport and Cross, but that doesn't work anymore since we've started providing the precise entry position for cross, too. That's required in order to ensure that the user is allowed to enter the parcel that he's walking into.
2014-05-19 11:19:11 +01:00
dd30a29ba0
Return more specific error messages if an attempt to enter a region fails due to permissions (in QueryAccess and IsAuthorizedForRegion)
2014-05-19 11:11:30 +01:00
882af7195c
Better error-handling and logging in case User Profile requests fail
2014-05-19 11:11:06 +01:00
96e5836b50
When can't rez, show only one error message; not two. And show more specific error messages.
2014-05-19 10:54:27 +01:00
ab1472e5b7
Don't trigger ItemUploaded when no item has been uploaded.
2014-05-18 23:01:55 -07:00
922f76a3a7
Don't fetch assets from the server when doing simple inventory operations like copy-paste items in inventory.
2014-05-18 07:49:01 -07:00
0be9e3b079
BulletSim: adjust avatar step up parameters to better walk up small
...
staircases. This change is required because of the change in the
avatar default shape from the capsule to the rectangle.
2014-05-17 20:11:22 -07:00
7c12dfe185
On ScenePresence.MakeChildAgent(), reset the m_originRegionID as this is currently being used as a flag to orchestrate destination simulator threads on teleport.
...
If not reset, it's possible that teleports back and forth between simulators may not restart scripts in attachments.
2014-05-14 22:08:06 +01:00
2f7539a25b
Remove a race where the client's SP.CompleteMovement() thread could attempt to restart attachment scripts before the source simulator's SP.UpdateAgent() thread had added them.
...
This commit changes the order of code so that attachments are re-added before the CompleteMovement() thread is released.
Relates to http://opensimulator.org/mantis/view.php?id=7148
2014-05-14 21:49:29 +01:00
0c0ee95bd8
minor: Clean up and make consistent some log file messages in EstateManagementModule relating to RAW file uploading.
2014-05-14 19:22:55 +01:00
484aa72ff8
minor: Add some method doc to IMessageTransferModule
2014-05-12 23:49:37 +01:00
8ad29fc5c8
Make offline IM delivery to URL (pre recent Addons code) have a 10 second rather than infinite timeout.
...
This both signals a problem with the URL and eventually frees the thread, rather than hanging indefinitely with no information.
2014-05-12 23:42:47 +01:00
87e2668529
For XmlRpcGroups (Flotsam) module, when MessageOnlineUsersOnly = true, handle notices to offline users directly as known undeliverable messages rather than discarding or attempting delivery.
...
Offline notices can still be controlled with the [Messaging] ForwardOfflineGroupMessages setting.
Looks to address more of http://opensimulator.org/mantis/view.php?id=7037
Only for Flotsam now for testing, but if approach works should be possible with core offline notices as well.
2014-05-12 23:38:48 +01:00
515d373a8e
Add send group notice regression test for when MessageOnlineUsersOnly=true
2014-05-12 22:54:54 +01:00
8457044b2f
Eliminate subsequently unused scene finding in UndeliveredMessage() method of xmlrpc and core offline IM modules
2014-05-12 22:23:24 +01:00
19d8f05584
minor: eliminate unused UUID in xmlrpc GroupsMessagingModule.ProcessMessageFromGroupSession()
2014-05-12 22:15:01 +01:00
667a272cce
This little sucker had evaded my attention forever. As a consequence some assets associated with foreign users were being missed.
2014-05-09 11:06:03 -07:00
a845c1a893
Finished implementing redirects in GetTexture.
2014-05-07 19:38:33 -07:00
f4cba27105
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-07 17:00:12 -07:00
e44450cce1
Revert "fix infinite recursion loop in SendGridInstantMessageViaXMLRPCAsync()"
...
There is a problem here with infinite recursion, but this patch loses the 'hunting' behaviour where the code will attempt multiple lookups if the avatar is teleporting rapidly around different simulators.
This patch only does a single lookup before giving up.
This reverts commit cecb446e0e
2014-05-06 19:53:35 +01:00
78015bbbdc
Console commands for Estate Mgmt
2014-05-06 18:55:42 +01:00
9e83b43009
new version of patch to add default-user switch new version :qw :wq updated version of default user switch for load oar :q :q
2014-05-06 18:48:59 +01:00
8b3c2f7d0c
updated version of default user switch for load oar :q :q
2014-05-06 18:48:42 +01:00
cecb446e0e
fix infinite recursion loop in SendGridInstantMessageViaXMLRPCAsync()
2014-05-06 17:52:32 +01:00
0faba7dc33
Fix avatars going to corner of region when they are sitting on a child prim and the prim is deleted.
2014-05-06 17:41:13 +01:00
e245638f24
Change llUnSit to be able to unsit any avatar that is currently sat on the object, not just avatars sitting on the sittarget in the object containing the script. or when the object is owned by the parcel, land group or estate owner.
2014-05-06 17:35:34 +01:00
c9742c826d
Mantis 7146 The lsl function llGetMassMKS is not implemented
...
This patch implements llGetMassMKS as it is described in the wiki
http://wiki.secondlife.com/wiki/LlGetMassMKS
2014-05-06 17:31:21 +01:00
95eeb4dde8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-06 17:22:47 +01:00
614b9e14c4
When moving an item from a prim to a user's inventory, don't delete the item from the prim until it was successfully copied to the user
2014-05-06 07:28:46 +01:00
eb79c882ea
Show more meaningful error messages when failed to move an item from a prim to a user's inventory.
...
Also, actually show the error to the user in more cases. (Previously, sometimes the operation failed without telling the user anything.)
2014-05-06 07:28:45 +01:00
1e5cff32fc
Show more meaningful error messages when failed to give an item to another user
2014-05-06 07:28:44 +01:00
0fe08c8799
- When sending the "My Suitcase" folder to the client, always claim it has Folder Type 8. (Previously we had used Folder Type -1 in one place, and LLClientView didn't even bother changing Folder Type 100 to anything else.)
2014-05-06 07:16:37 +01:00
7862d1e20d
Added range-checking for the parameters to PRIM_POINT_LIGHT (used in llSetLinkPrimitiveParamsFast() )
2014-05-06 07:14:58 +01:00
13b2ac1425
Makes it possible to support grids in which all the simulators share all central services of a Robust server EXCEPT assets. In other words, grids where the simulators' assets are kept in one DB and the users' inventory assets
...
are kept on another. When users rez items from inventory or take objects from world, an HG-like asset copy takes place between the 2 servers, the world asset server and the user's asset server. This makes the simulators independent of the central asset server.
Note that this an advanced configuration and requires some security strengthening coming up.
2014-05-04 20:54:42 -07:00
53b72ab4b8
minor: Comment out Cacheitems debug log lines for now
2014-05-02 13:31:58 +01:00
3a2c099169
Mantis 7144 missing ATTACH_AVATAR_CENTER constant
...
This patch adds ATTACH_AVATAR_CENTER and ATTACH_NECK
2014-05-01 23:20:31 +01:00
c31d93cb6f
Fix issue where only one of multiple attachments on the same attachpoint for NPCs would be seen by other viewers.
...
It appears that at least Singularity 1.8.5 (but probably others) rely on attachment FromItemIDs being different to display more than one.
This commit resolves this by generating random IDs instead of always using UUID.Zero for NPCs.
Resolves http://opensimulator.org/mantis/view.php?id=7110
2014-05-01 22:24:21 +01:00
7c121a2acc
Change XEngine to call StateChange rather than RemoveScript on state changes
2014-04-30 20:56:49 +01:00
f0eeb47262
Add the "StateChange" function to the async comand manager to differentiate
...
between state changes and script exit/reset.
2014-04-30 20:54:34 +01:00
7bb673a854
minor: Correct mistake in terrain flip error message from previous commit 5d01a1f
2014-04-30 19:41:11 +01:00
5d01a1ff4d
minor: Print output in response to terrain console commands on the console rather than in the log.
2014-04-30 19:24:17 +01:00
253110293a
Add "terrain show" console command which outputs terrain height for a given region co-ordinate.
...
For debug purposes.
2014-04-30 18:04:47 +01:00
5fc61942e0
minor: convert back some tabs to spaces that got into ScenePresence via recent patch bc969a6b
2014-04-29 20:15:29 +01:00
d4eee213a9
Restore terrain height and flying adjustments that were eliminated from non-megaregion paths in ScenePresence.MoveToTarget() by recent patch bc969a6b
2014-04-29 20:05:08 +01:00
2dbc18054e
Add regression test for NPC movement on a variable region.
...
Extends basic physics to allow av movement on a varregion (basic physics is only really useful for regression test purposes).
2014-04-29 19:29:16 +01:00
06e4fcd260
Fixed the UpdateAgentInformation CAP: the viewer expects the simulator to echo back the maturity that it sent
...
Without this change, attempts to change the maturity rating in the viewer's Preferences don't work.
2014-04-29 07:59:10 +01:00
df89e15290
BulletSim: non-functional changes to debugging statements and formatting.
2014-04-28 18:36:50 -07:00
63aea3a5f2
BUlletSim: move safeynet ground plane to lower altitude. Define new BulletSim
...
parameter 'TerrainGroundPlane' which defaults to -500.
BulletSim had assumed altitudes never went negative but that is not true. The
ground plane is just a safety net so things wouldn't fall to infinity.
2014-04-28 11:08:47 -07:00
d97896d39a
Differentiate between requests only the owner should be able to do and those
...
that managers can do when setting parcel data
2014-04-26 20:32:27 +02:00
5c661baf6c
Allow opening a https port using only http so that nginx can be used for ssl
2014-04-26 02:42:30 +02:00
2e216aa056
Add missing [Test] decorator to actually get the basic scene creation test from 2227f51b to run
2014-04-25 23:35:20 +01:00
9664273df6
Add basic regression test for creating a var region
2014-04-25 23:34:30 +01:00
2227f51b29
Add basic sanity regression test for creating a scene.
2014-04-25 23:16:07 +01:00
38acda9f29
Add regression test for terrain fill at two digit height and max ll height.
2014-04-25 23:01:24 +01:00
904baa6da6
Fix issue where terrain height values > 327 caused chaotic spiked terrain.
...
Per http://wiki.secondlife.com/wiki/Tips_for_Creating_Heightfields_and_Details_on_Terrain_RAW_Files#Notes_for_Creating_Height_Field_Maps_for_Second_Life
terrain heights up to 508 are possible on the LL grid (and were available on previous releases of OpenSimulator).
The obvious way to allow both this and equivalent -z values, is to rewiden the internal terrain height storage from short to int.
The memory tradeoff is most noticeable on the maximum 8192x8192 var region (equiv to 1024 normal regions), where it adds 128mb to resident use (128k on a normal region)
This is still better than the double used in previous releases.
This does not affect physics or data storage since they already use float and double respectively.
This may not be the final solution if we actually want to sacrifice -z, >327 or something else.
Relates to http://opensimulator.org/mantis/view.php?id=7076
2014-04-25 22:56:25 +01:00
a108fcac95
Restore overload mode accidentally disabled in a prior commit. Add a new
...
config option, LogOverloads, to log when a thread pool overload occurs.
This option defaults to "True" because the logging data is useful for
diagnosing threading issues.
2014-04-25 21:34:29 +01:00
2572ed9ed9
Adjust permissions to work hand in hand with what the viewer believes they are.
...
This fixes the issue of "Show in Search" seeming resetting at random.
2014-04-25 00:35:53 +01:00
cf54df3ecf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-04-24 14:12:04 -07:00
1d9a9e6004
Fixes a long-standing bug related to god-mode change ownership of objects permissive, where the permissions of the children prims' inventory items were not changed. As a consequence, we couldn't control some of the objects imported via HG and OARs even in god mode.
2014-04-24 14:11:42 -07:00
e8a2eff2e8
Changed how UserProfile performs a fallback call using the OpenProfile API, because now JsonRpcRequest() returns an error result instead of throwing an exception
2014-04-24 15:58:43 +01:00
d62f0bc35d
Refactored: moved OpenProfileClient to a location where it can be used by both the Simulators and Robust
2014-04-24 15:58:42 +01:00
7180690a14
Show Group name when land is group-owned
2014-04-23 23:29:17 +01:00
c77cd6adc7
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
2014-04-23 22:59:28 +01:00
fb321a0573
Prevent sending Land Properties for unprivileged users
2014-04-23 22:59:13 +01:00
5092cbd77e
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
2014-04-23 19:55:51 +01:00
cb1f2886cd
Prevent sending Land Properties for unprivileged users
2014-04-23 19:50:59 +01:00
7a5699224e
Fix regression test break on previous commit 328bc3b
2014-04-23 19:46:58 +01:00
328bc3b76e
Adjust avatar sit positioning on a target to pretty much exactly match that of the LL grid.
...
This uses an offset of 0.05 on the up vector of the sit orientation, after extensive analysis on
http://opensimulator.org/mantis/view.php?id=7096 and https://wiki.secondlife.com/wiki/Talk:LlSitTarget
This supersedes the previous adjustment in 5b73b9c4
2014-04-23 19:19:09 +01:00
b01e73cf27
Dynamic textures shouldn't be saved in the assets service (only in the simulator cache)
2014-04-23 14:42:40 +01:00
7eb12f96ec
Hypergrid: don't send Local assets to other grids
...
This commit also contains other changes, but they're all just for clarity. The only actual behavior change is to avoid Posting local assets.
2014-04-23 16:42:23 +03:00
018832522c
Removed GetUserInventory(). It wasn't being used, and was creating warnings because it's Obsolete.
2014-04-23 14:38:33 +01:00
998d7009a6
Eliminated many warnings
2014-04-23 16:37:36 +03:00
a893fd90cd
Fixed KeyframeMotion to work with very slow movement.
...
Previously, if the movement speed was below 0.05/sec then it didn't work correctly.
Fixes http://opensimulator.org/mantis/view.php?id=7117
2014-04-22 10:19:11 +01:00
93a9ed2a6d
Changed the maximum asset name and description lengths to constants. Also, pre-truncate the description of dynamic textures.
2014-04-22 12:18:54 +03:00
4cac87d9f4
Fixed: when a user logged-in, sometimes he didn't get notified of the Online status of friends, so they continued to appear Offline.
...
This happened because these notifications (the UDP packets) can only be sent to Root Agents. But the notifications were done in OnClientLogin(), at which point the client is still a Child Agent. Since a FireAndForget is used, it became a race condition as to whether the packets would be sent before or after the client became a Root Agent.
To fix this, we now only send the notifications once the client becomes a Root Agent for the first time.
2014-04-21 16:56:49 +01:00
bc969a6b46
Possible solution for #7120 and #7051
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-04-21 05:58:29 -07:00
f93dac9239
Implement Oren's fix to prevent a privilege escalation with groups
2014-04-20 10:47:31 +02:00
3f76f72137
Better error-handling when storing assets: recognize that 'null' is an error value
2014-04-20 06:23:38 +01:00
853c0fccc8
Fixed: when any avatar changed his Active Group, it was set as the active group for *all* the avatars in the scene (not permanently)
2014-04-20 06:23:37 +01:00
090f9bcece
Fixed: once a user has rezzed an object, they could then duplicate it as much as they wanted even if the parcel's permissions had since been changed to disallow rezzing
2014-04-20 06:23:36 +01:00
3185db7f94
Fixed: if a user belonged to the parcel's group then he was allowed to rez object in the parcel even if the flag "Create Objects by Group" was disabled
2014-04-20 06:23:36 +01:00
a780e01a54
Fixed: the parcel flag "Allow Scripts from Group" should only check if the parcel has a Group set; it doesn't have to be *deeded* to the group
...
Also some cleanup of the use of Group ID's (with no change to functionality).
2014-04-20 06:23:35 +01:00
63fd027494
Catch empty url error
2014-04-19 22:25:21 -04:00
b3ebec184f
In teleports, when sending the Source region, set its ServerURI to the Gatekeeper URI (which is used with Regions); not the Home URI (which is used with Users)
2014-04-13 12:58:37 +03:00
c8914d22eb
BulletSim: reduce the terrain collison margin to be the same as other
...
objects in the world.
This was originally changed in an attempt to make vehicles work better
but the effect was not that large and it causes avatars to float
above the terrain.
2014-04-12 17:37:57 -07:00
18b91fdbe9
Tweak to PrimLimits and add missing Regions.ini example
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-04-12 14:40:34 +01:00
f0998a9222
Add per-user checking to PrimLimitsModule
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-04-12 09:28:29 +01:00
7c148d9b2f
minor: use constants instead of magic numbers in llRequestAgentData() where possible
2014-04-11 00:52:28 +01:00
de0ab04d00
Actually add the llRequestAgentData() test class for commit 530c86
2014-04-11 00:36:50 +01:00
530c86335d
Fix the presence info caching used in llRequestAgentData(), which was completely inoperative.
...
This means the presence info may be out of date by up to 20 seconds, but this avoids scripts potentially triggering constants requests to user accout and presence info services.
Relates to http://opensimulator.org/mantis/view.php?id=7088 though I fixed in a different way.
Adds regression test for this case.
2014-04-11 00:29:06 +01:00
562a3cb338
BulletSim: small tweek to avatar height reduce feet embedded into prims.
...
This adjustment makes a default, shoeless avatar stand properly on a prim
for the various heights (0% to 100% in the appearance adjustment).
2014-04-10 06:53:36 -07:00
32ad66c274
Allows to sell objects on a parcel of land together with that parcel of land. The objects that are sold together with the parcel of land need to fulfill the following preconditions: owned by the current parcel owner, not set to a group, transferrable. This feature does not work for group owned parcels or land bought by a group.
2014-04-10 11:47:46 +02:00
c725ad1577
Fixed: when teleporting between grids, the avatar name wasn't always updated.
...
When an avatar is in their home grid, their name appears as "First Last". In other grids the name appears as "First.Last @grid.example.com". However, viewers have a bug and they don't always show the new name. We use a trick (changing the Group Title briefly) in order to make the viewers show the new name. This is only done after a Hypergrid teleport.
2014-04-09 15:00:54 +01:00
06e0528d0b
In teleports, pass the source region to the destination (similar to an HTTP referrer)
2014-04-09 09:22:20 +01:00
af406748a2
Improved error messages when a teleport fails. The viewer's dialog already says "Teleport failed", so adding "Teleport refused" is redundant.
2014-04-08 08:11:30 +01:00
e00f1a0410
Allow invalidating the users cache
2014-04-08 08:11:29 +01:00
85d51e57a9
When sending QueryAccess to a region, also send the user's Home URI
2014-04-07 07:32:36 +01:00
55cc8044cb
Refactored: use Scene.GetAgentHomeURI() to get the Home URI of a user
2014-04-07 07:26:44 +01:00
bb841ea9ce
Change OfflineMessageModule to support more differentiated return values and allow support for mobile devices and other non-viewer logins
2014-04-06 23:22:37 +02:00
f3508649f5
Fixed: during a teleport we always sent the error "The teleport destination could not be found" to the client. This happened on both success and failure.
...
On successful teleports this error wasn't actually shown to the user. But on failed teleports this error could hide the true cause of the failure. For example, attempting to use a Landmark that's more than 4095 regions away would result in two warnings appearing in the viewer: "Region too far" and "Destination could not be found". The second message hid the first one, so it wasn't obvious to the user what is actually the problem.
2014-04-06 15:42:33 +01:00
abe0f4a088
When preparing a Hypergrid teleport, tell the receiving grid which user is entering the grid.
...
This can affect which region to use. E.g., returning users may be allowed to enter any region, whereas users from other grids will have to enter a gateway region. Previously per-user decisions were only made later, but by then it's too late to change which region the user enters.
2014-04-06 15:40:45 +01:00
d4acaf25af
Pass the correct position to QueryAccess() instead of UUID.Zero (it was wrong in one place)
2014-04-06 15:40:45 +01:00
cacbb5c165
Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it (this time with the right code change)
2014-04-05 02:16:14 +01:00
86a2cd915c
Revert "Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it."
...
This reverts commit 2c00b73cd2
2014-04-05 02:11:36 +01:00
2c00b73cd2
Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it.
2014-04-05 02:09:44 +01:00
8b8e1b88ec
fixed object-collision issue after uncheck phantom-flag
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-04 12:29:44 -04:00
aec723b955
Fix sp.AbsolutePosition when agent is sitting on a child prim, which in turns fixes llDetectedPos(), llGetLinkPrimitiveParams() and similar functions.
...
Add regression test for this case.
In relation to http://opensimulator.org/mantis/view.php?id=7043
2014-04-03 23:22:57 +01:00
6b1d09813e
remove some whitespace that snuck in with last patch
2014-04-03 13:25:32 -04:00
50eec6df52
Add Varregion support to Terragen Handler
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 13:14:13 -04:00
3c5b7d7b79
BulletSim: Minor Fix to vehicle hovering, add more ways to disable it.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 13:07:48 -04:00
4aa483777b
Move new Estate commands to OpenSim.cs
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 12:45:43 -04:00
6d2893be67
When teleporting using Hypergrid, show more informative error messages in case of error
2014-04-03 14:13:03 +01:00
65c4cb48ac
BulletSim: make avatar physical shape to be a rectangle rather than
...
a capsule. Set the default to be the rectangle shape and adjust the
parameters in OpenSimDefaults.ini for the new shape.
The rectangle shape will perform better and avatar height can be
computed more accurately.
2014-04-02 21:53:58 -07:00
9406db3047
Fix problem with floating avatar by passing avatar size information
...
to the physics engine.
This operation was accidentally removed while in the middle of improving
the computation of the avatar height. This is a temp fix until the real
solution is added.
2014-04-02 21:52:24 -07:00
e756457703
Remove redundant part.SitTargetAvatar setting from SP.MakeRootAgent as part.AddSittingAvatar already does this.
2014-04-03 01:21:50 +01:00
6ac9c9c972
refactor: Use m_sittingAvatars to maintain the list of sitting avatars instead of two independent structures that do exactly the same thing
...
m_sittingAvatars code also already properly handles locking to avoid races.
2014-04-03 01:14:39 +01:00
91b7679db9
minor: Fix warning in AvatarFactoryModule
2014-04-03 00:35:42 +01:00
17929abd28
Wrap contents of ETM.CrossAgentToNewRegionAsync() in try/catch to avoid a failure terminating simulators running on Windows
...
In relation to http://opensimulator.org/mantis/view.php?id=7050
2014-04-03 00:34:20 +01:00
5cb4044539
Don't clear avsToCross in SOG.AbsolutePosition.set(), this is unnecessary since the structure is local and never reused after the clear
2014-04-03 00:26:55 +01:00
e6d0dcd4e8
Fix bug where crossing to a neighbouring region and back again would trigger an exception, and a second recross would stop the user moving until relog
...
Also fixes an issue where sitting avatar counts became inaccurate after any cross.
Part of the problem was due to cloning code using MemberwiseClone() but not resetting certain collection structures.
Adds regression test for this case.
In relation to http://opensimulator.org/mantis/view.php?id=7050
2014-04-03 00:19:53 +01:00
0301c81b01
Made GetScenePresence() case-insensitive when searching by user name. This makes it easier to use console commands such as "show appearance".
2014-04-02 13:08:31 +01:00
d1c3f8eef5
Added assets service method AssetsExist(), which returns whether the given list of assets exist.
...
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
2014-04-02 06:30:57 +01:00
ac16a667e1
fix orphaned code in sun module per mantis 7068
2014-04-01 19:48:03 -07:00
7bafee28fa
Removing warning from SceneObjectLinkingTests.TestLinkDelink2SceneObjects() by actually checking whether delinked grp3 is not null
2014-04-02 01:26:58 +01:00
46095c058e
minor: comment out currently unused RegionCombinerModule.LogHeader
2014-04-02 01:24:40 +01:00
e5a5b69b08
remove EstateManagmentCommands.m_commander that has been unused for some time
2014-04-02 01:23:40 +01:00
43eab5e163
Console command to rename Estate
2014-04-02 01:17:41 +01:00
444737c830
minor: Only calculate fetched usedPrims and simulatorCapacity info in PrimLimitsModule.CanObjectEnter() when we know for sure that we need them.
2014-04-02 01:05:37 +01:00
7cb1690589
minor: disable logging in recently added scene object crossing tests and remove some unnecessary test config
2014-04-02 01:01:53 +01:00
0af8886400
Fix problem where moving an object to another region on the same simulator was failing, with the object returning to its original position.
...
Root cause was that PrimLimitsModule was not properly handling the case where the parcel it was asked to check was outside the current region's bounds.
If this is the case, we can abort the check since the receiving region will perform it.
Added a regression test for this case.
2014-04-02 00:58:33 +01:00
4cbd45f3d5
Merge branch 'master' of /home/opensim/src/opensim
2014-03-31 15:50:27 -04:00
59d0e3c3c8
Add check to prevent the return of a wrong value when key is NULL_KEY
2014-03-31 15:49:53 -04:00
635f3f77ab
Console command to change Estate owner
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-29 00:59:15 -04:00
6557eba235
Removed default timeout when starting scripts after Load OAR
2014-03-28 13:04:19 +03:00
1fe504fee5
Better skipping of "SculptData" when parsing XML
2014-03-28 12:52:06 +03:00
f360b687d6
Removed "SculptData" from the serialized XML format of prims
2014-03-28 07:51:21 +01:00
a15282f023
Merge branch 'master' into m_test
2014-03-27 12:21:38 -04:00
b0bae62c30
refactor: Actually use MaptileStaticFile in RegionInfo rather than having both a public field and a get property
2014-03-26 20:58:58 +00:00
7a47c15edb
- Increased the threadpool timeout to 10 minutes
...
- Changed a few places that launch long-lasting threads to skip the timeout altogether
2014-03-26 20:34:55 +01:00
62a03a5cac
Also take YP/commented out JS references from script engine CodeTools.
...
Fixes build break from d3387d591a
2014-03-26 01:20:49 +00:00
d3387d591a
Remove unmaintained and unused YieldProlog scripting language
...
This hasn't been mainntained since 2008 and has not been kept up with the rest of the language infrastructure.
Hence, it almost certainly doesn't work and has never been used, afaik
If this is wrong, please say on the opensim-users/dev mailing list.
Removing to reduce maintenance burden (since it still needs to be made to compile).
2014-03-26 00:59:57 +00:00
99308d64c6
minor: Add some doc to Scene.Backup() detailing its direct invocation if the indepedent backup thread is not running (e.g. in a regression test)
2014-03-26 00:43:17 +00:00
14836e60ff
Fix issue with user picks creation. The snapshot id is UUID.Zero in new parcels.
2014-03-25 11:10:48 -04:00
542bef20e8
Move JsonRpc request code out for general availability
2014-03-25 11:08:27 -04:00
368b29a680
In Core Profiles: as a fallback, try to get profiles from foreign grids using the OpenProfile protocol
...
Resolves http://opensimulator.org/mantis/view.php?id=6954
2014-03-25 09:37:18 +01:00
e131e73652
Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout)
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:55 +01:00
e735f76553
LogThreadPool: when the thread is for ProcessPacketMethod, also log the packet type
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:41 +01:00
a30ad71651
Guard against Scene being null in attachments it the wearing avatar is in the process of logging out.
2014-03-25 03:17:44 +01:00
075cf2baa3
Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels
2014-03-25 03:17:04 +01:00
17aeec8860
Reinstate the timed region change signal
2014-03-25 03:16:37 +01:00
091f3a8000
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-25 00:20:38 +00:00
e12c044eab
Don't fail to enable permissions modules correctly if there is any leading or trailing whitespace between comma separate module combinations.
2014-03-25 00:19:24 +00:00
1769e93c42
Fixed parsing of coalesced objects if the XML starts with an XML Declaration ("<xml ...>")
...
Resolves http://opensimulator.org/mantis/view.php?id=6944
2014-03-24 18:18:29 +01:00
1a32b35279
In Load OAR, correctly restore group-owned objects
...
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24 18:18:23 +01:00
305f5110c6
In Load OAR: Zero isn't a valid Group ID
...
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24 18:18:08 +01:00
35078e03e5
During Load OAR, fix the User and Group ID's in objects that are embedded in assets (previously only rezzed objects were fixed)
...
Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-03-24 18:17:59 +01:00
5fd9411143
Refactored Load IAR: created a generic mechanism to modify the SOG's as they are being loaded
...
Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-03-24 18:17:35 +01:00
c8583e566d
When searching for users, don't add users from the local cache if they have an invalid UUID
...
Resolves http://opensimulator.org/mantis/view.php?id=6935
2014-03-24 18:01:37 +01:00
a2dd8f31de
Trim search queries (for users, groups, etc.). I have found that sometimes the viewer adds a space at the end, which causes searches to fail.
...
Resolves http://opensimulator.org/mantis/view.php?id=6935
2014-03-24 18:01:28 +01:00
6edc446780
Fixed: OnRegionInfoChange was never triggered
...
Resolves http://opensimulator.org/mantis/view.php?id=6934
2014-03-24 18:01:22 +01:00
bf68dbabd7
Save to database these parcel updates: Force Owner, Abandon Request, Reclaim. (Previously these updates only changed the parcel in memory)
...
Resolves http://opensimulator.org/mantis/view.php?id=6934
2014-03-24 18:01:08 +01:00
89945f8829
Refactored: ExternalRepresentationUtils should be the only place where the "CreatorData" field is calculated, to ensure uniformity
...
Resolves http://opensimulator.org/mantis/view.php?id=6933
2014-03-24 18:00:59 +01:00
7496d0b0f7
Fixed unit tests for delinking objects
2014-03-24 15:05:39 +02:00
921f0052f4
Get the full viewer name even if it's (incorrectly) sent in the 'Channel' field
...
Recent versions of Firestorm and Singularity have started sending the viewer name in the 'Channel' field, leaving only their version number in the 'Viewer' field. So we need to search both of these fields for the viewer name.
This resolves http://opensimulator.org/mantis/view.php?id=6952
2014-03-24 12:26:52 +01:00
6734b94761
Better error messages
...
This resolves http://opensimulator.org/mantis/view.php?id=6936
2014-03-24 12:22:32 +01:00
773ffcafc3
Removed "hacktastic" code that is no longer needed.
...
We no longer set the object's AbsolutePosition in this place, so the IsAttachment hack doesn't do anything anymore.
This resolves http://opensimulator.org/mantis/view.php?id=6936
2014-03-24 12:05:25 +01:00
62b3bdf0fc
When linking two groups, and then deleting the combined group: delete *all* of the combined group's prims, including those that came from the second subgroup
...
This fixes http://opensimulator.org/mantis/view.php?id=6175
2014-03-24 11:44:48 +01:00
b0cb0ec02f
BulletSim: fix problem where axis constraints were also constraining
...
linear motion.
The code was limiting linear motion to be only in the positive direction
for any axis that was constrained.
2014-03-23 13:08:31 -07:00
db83208794
Fix negative stat for Active Scripts
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-22 23:02:10 -04:00
ff5c38534d
Reverting "Set default name for mute list" that was pushed by mistake.
...
This reverts commit 58def34dbe
2014-03-22 16:38:48 -04:00
58d7e3b8ed
Reverting "Pass method to offline.php" commit that was pushed by mistake.
...
This reverts commit fe16a72a9a
2014-03-22 16:31:36 -04:00
fe16a72a9a
Pass method to offline.php using ?blah instead of /blah/. Avoids issue with Apache web servers running PHP via CGI.
2014-03-22 15:13:03 -04:00
58def34dbe
Set default name for mute list module as shown in OpenSim.ini.example
2014-03-22 15:13:03 -04:00
d4dad75a3c
BulletSim: Fix jumping while running. Was unintentional taking way all upward target motion for avatar when running.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-22 15:00:48 -04:00
ebe7726cd7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2014-03-22 01:49:28 +00:00
a4d322dcd1
Allow the setting from the environment to take effect if no explicit setting is given.
...
This is done by calling the constructor only with a directory if one is actually given.
2014-03-22 01:47:48 +00:00
ccf18fd2ef
Rename SOG.InSceneBackup to CanBeBackedUp to reflect its actual functionality.
...
It does not indicate that a SOG has been set to be backed up or not. It indicates that a SOG can be backed up in principle.
In practice, this was added by lbsa71 in 2007 and is set to always true, albeit as a virtual property.
2014-03-22 01:36:21 +00:00
3d0778bcd6
Allow Mono Plugin Registry setting for Regions
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-03-22 01:29:51 +00:00
a5800f479e
If an object has it's temporary flag unset after being set, put it back in the persistence list.
...
Effectively uses the patch in http://opensimulator.org/mantis/view.php?id=7060
But also adds a regression test and exposes the necessary property to allow this to work.
2014-03-22 00:29:13 +00:00
178a5a5585
rename prefix of scene-inventory.<scene-name>.ProcessedFetchInventoryRequests and QueuedFetchInventoryRequests to inventory.httpfetch.*
...
Actual inventory processing is done with a single set of static structures rather than per scene.
2014-03-21 23:29:31 +00:00
fb312279c9
Mantis 6922: No particles are generated if their size exceeds the maximum allowed size.
...
This patch ensures that no particle scal value can exceed 4.0
2014-03-21 23:13:34 +00:00
da25903300
Adding a way to disable/enable the in built Dwell Module
2014-03-20 22:35:50 +00:00
d04bb3ca9b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-20 20:15:57 +00:00
bd6f734d3a
Mantis 6974 PERMISSION_TRACK_CAMERA should be implicit on attach.
...
http://wiki.secondlife.com/wiki/Run_time_permissions
This change makes PERMISSION_TRACK_CAMERA implicit on attach
2014-03-20 20:11:26 +00:00
b5f94c72b9
Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles
2014-03-19 11:16:52 -04:00
61353dde80
Allow Region specific static maptiles to be loaded from file.
2014-03-18 22:18:50 -07:00
1497b75361
minor: Put ProcessedFetchInventoryRequests and QueuedFetchInventoryRequests in stats category "scene-inventory" instead of "scene"
...
To distinguish from general scene stats
2014-03-19 00:37:06 +00:00
a660c0a750
Add scene.<scene-name>.ProcessedFetchInventoryRequests
...
This shows the number of requests that have been processed.
These have not necessarily been sent back to the request since this is done separately by the PollServiceRequestManager
2014-03-18 20:59:11 +00:00
e82d394ddf
Add scene.<scene-name>.QueuedFetchInventoryRequests stat
...
This is to aid in detecting whether there are fetch inventory requests remaining to be processed.
2014-03-18 20:10:41 +00:00
f3e177814a
Add regression test for http inventory fetch.
...
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
2014-03-17 20:51:35 +00:00
873eee5431
Implement osForceBreakAllLinks().
...
Identical to llBreakAllLinks() except that it doesn't require the script to have link permissions.
2014-03-13 00:04:20 +00:00
6a279feb2f
Only allow llBreakAllLinks() to work if script has received PERMISSION_CHANGE_LINKS
...
As per http://wiki.secondlife.com/wiki/LlBreakAllLinks
Same as existing llCreateLink() and llBreakLink()
2014-03-12 23:54:20 +00:00
296d63e20b
Implement osForceCreateLink() and osForceBreakLink()
...
These are identical to llCreateLink() and llBreakLink() except that they don't require script permissions.
However, osForceCreateLink() still requires that linked and linkee still have the same owner.
There's also an AutomaticLinkPermission setting in [XEngine] that could be set to true to prevent the LSL function checks.
But this doesn't allow the finer control over which users/scripts, etc. can do this that the OSSL functions provide.
2014-03-12 23:05:16 +00:00
beba20846f
When sending group notices through group messaging, allow the agent ID to use for fetching group data to be different from im.fromAgentID
...
This is because xmlrpcgroups currently always checks visibility for the requesting agent ID (unlike Groups v2, which can accept UUID.Zero)
But group notice IMs have a from agent which is the group rather than the sending agent.
Further addresses http://opensimulator.org/mantis/view.php?id=7037
2014-03-12 19:31:04 +00:00
7112ee0015
Enable MapImageServiceModule with no refresh
2014-03-11 23:52:11 +00:00
86630a1b70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-11 23:39:07 +00:00
d975b42f6a
Instead of auto-creating a parcel on request if one doesn't cover a given location, fill in gaps or extend existing parcel right after initial data load.
...
This is in line with simpler and still existing behaviour where a default parcel is created if no parcels are in storage at all.
Making this change as another step to address current problems with spurious parcels occasionally being created.
Also adds regression tests for different load behaviours depending on existing stored parcel data.
Relates to http://opensimulator.org/mantis/view.php?id=7035
2014-03-11 23:38:22 +00:00
8edf4225f3
varregion: remove serialization of region terrain to floats when sending patches.
...
This should eliminate much memory thrashing and CPU usage while sending initial
terrain.
The old way of passing terrain was to convert it to an array of floats. This is
really bad for large terrain (think 4096x4096 floats). This change passes a dummy
float array since the real region info is used anyway and the floats are ignored.
(The ignoring the terrain floats is a kludge so as to not change IClientAPI.)
2014-03-11 07:12:47 -07:00
742f505440
Change terrain update sending to be triggered by frame tick rather
...
than everytime terrain is changed.
The TerrainModule now hooks the frame event and, if terrain has changed,
sends terrain updates to the clients. This polling pattern replaces
the previous push on change pattern and will make it easier to do per
client throttling and per scene presence terrain update ordering.
2014-03-10 22:05:18 -07:00
0237d9113d
Don't start KeyframeMotion timers until all the regions are ready. This prevents problems in megaregions (prims that think they've crossed over to other regions).
2014-03-11 00:55:58 +00:00
120f872d2b
After an object with KeyframeMotion is copied into inventory, resume the motion (previously it remained stopped)
2014-03-11 00:43:22 +00:00
932c9e757b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-11 00:16:31 +00:00
77e7bbcbf7
Send group notices through the same messaging module mechanism used to send group chat to avoid timeout issues when sending messages to large groups.
...
Only implementing for XmlRpcGroups initially to test.
May require MessageOnlineUsersOnly = true in [Groups] to be effective.
In relation to http://opensimulator.org/mantis/view.php?id=7037
2014-03-11 00:11:18 +00:00
9de3fe9410
Add Varregion support to osGetRegionSize OSSL function
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-07 17:48:07 -05:00
8225e3f40c
Remove try/catch in LandManagmentModule.GetLandObject() - this is very old code and the caught exceptions can no longer occur.
2014-03-07 01:41:31 +00:00
3c05d67094
Lock m_landlist whilst loading parcels from storage to prevent a race against any parcel auto-creation in GetLandObject()
2014-03-07 01:36:06 +00:00
6b7625a56b
Only auto-create a land parcel when there is none in a specified tile if there is more than 1 existing land parcel.
...
This is because there are still issues with bad parcels being generated in http://opensimulator.org/mantis/view.php?id=7035
Theorizing now that it's possible that something is calling GetParcel() before any parcel data has been loaded from persistence.
2014-03-07 01:23:19 +00:00
71918eeab4
Add regression test for sending group notices via xmlrpc groups connector.
2014-03-07 01:04:54 +00:00
ddd38a3dea
Add scene name to bad parcel add logging
2014-03-06 19:12:16 +00:00
58c0ed78d4
refactor: Simplify land object by using c# get/set auto-properties where applicable.
2014-03-06 02:12:58 +00:00
470d053443
minor: slightly simplify code in LandObject.ContainsPoint()
2014-03-06 00:51:39 +00:00
ed14e97bb4
Remove array initialize calls in LMM - these are unnecessary as the VM already does this.
2014-03-06 00:46:16 +00:00
aa2fb1ec25
minor: Increase size of parcel name field in "land show" console command output. Construct table using CDT rather than string formats
2014-03-06 00:40:24 +00:00
14569992e1
Prevent adding a land object if it overlaps any existing objects that have not had their bitmaps adjusted.
...
This is to prevent an immediate problem in http://opensimulator.org/mantis/view.php?id=7035 where a development code bug occasionally overlays all the existing parcels with a blank parcel owned by the estate manager and to gather more data.
My guess is that this parcel is being created by the new code in LandManagementModule.GetLandObject(), probably some race between threads since this only happens occasionally.
Adds regression tests for this case and for parcel subdivide.
2014-03-06 00:11:13 +00:00
4e6f7435d0
Add UUID and ready status (whether region has finished starting up) to "show regions" console output.
2014-03-05 01:23:48 +00:00
39ed382ddf
Don't request a terse update after local teleport - this will be done by the main frame loop anyway and has the potential to race that thread.
2014-03-05 00:59:27 +00:00
c9415fd763
If an avatar is sitting, send out position updates to clients for any change, not just those outside the usual tolerances.
...
This is to allow small adjustments of less than 0.05m in functions such as llSetPrimitiveLinkParams() to work
This is another fix for http://opensimulator.org/mantis/view.php?id=7044
Extends regression test for this case.
2014-03-05 00:38:38 +00:00
31de7b845f
When positioning agent with PRIM_ROTATION in llSetLinkPrimitiveParams(), set the global rotation rather than the local rotation
...
Functionally the same as the patch in http://opensimulator.org/mantis/view.php?id=7044 , thanks Aleric.
This commit also extends the regression test
2014-03-03 23:35:21 +00:00
5038a59ef3
Maybe slightly reduce warp3d memory leakage by disposing of decoded bitmap in Warp3DImageModule.GetTexture()
...
However, this still appears to be leaking massively, at least for me. Possible cause is warp3D using GDI objects internally and not disposing of them.
2014-02-28 00:16:06 +00:00
91333b9267
Stop LSL_Api.GetLinkEntities() from creating an unused list on every parameter except LINK_THIS. Simplify code.
2014-02-27 00:23:24 +00:00
ed760f2586
minor: remove unused variable from recent commit 0e23374
2014-02-27 00:14:16 +00:00
d7c9725ec0
refactor: Make osGetPrimtiveParams() and soSetPrimitiveParams() use common get/set params code in LSL_Api rather than an old copy&pasted section.
2014-02-27 00:11:50 +00:00
6955190c7d
Add Util method to load OpSys env vars
2014-02-26 23:39:45 +00:00
ce5d308d23
Add some regression tests for previous commit 0e23374
2014-02-26 23:13:56 +00:00
0e23374aa2
Implement PRIM_ROTATION, PRIM_ROT_LOCAL, PRIM_POSITION and PRIM_POS_LOCAL when manipulating avatars via llSetLinkPrimitiveParams()
...
Combination of core parts of Freaky's patch at https://github.com/ft-/opensim-patches/blob/master/opensim-llsetlinkprimitive-agent-fix.patch plus further adjustments from myself.
Resolves Mantises 6121, 6421, 6573, 6657
2014-02-26 23:07:13 +00:00
26fe59c35e
Improve regression test TestSetAppearance()
2014-02-24 19:43:06 +00:00
bc9952f901
Re-enable regression TestSaveBakedTextures()
2014-02-24 19:30:33 +00:00
fd1b2a1c57
Stop mesh avatars that specify the alpha texture in their bake slots from causing the simulator to continually request that they rebake
...
This is because the alpha texture is not in the cache, we must continue to have the fallback of looking for these and other persisted bakes in the asset service.
Relates to http://opensimulator.org/mantis/view.php?id=6927
2014-02-24 19:20:50 +00:00
0f03c64a0c
Make Scene.DefaultDrawDistance to be the max of the region size and the
...
user setting. Seems this parameter has many side effects.
2014-02-23 21:56:37 -08:00
0b213af675
Fix problem of hurricane speed winds. Thanks Vegaslon.
2014-02-22 15:04:28 -08:00
11b4f534c2
If texture decode fails in Warp3D map maker, log uuid of asset that failed to decode along with exception
2014-02-20 23:36:50 +00:00
28419251bf
minor: Add some method doc to AFM,SetAppearanceAssets()
2014-02-20 19:30:47 +00:00
4d1426e77d
For now, do not replacing missing wearables with default wearables if itme details cannot be found.
...
This is causing many issues on OSGrid, possibly due to teleporting timing differences with simulators hosted in different places or HG teleports
Added a bit more logging for debug purposes.
See http://opensimulator.org/mantis/view.php?id=6939
2014-02-20 18:40:21 +00:00
a2866b85f3
add newRegion parameter to CrossAgentToNewRegion event and trigger the event after crossing thread is invoked
2014-02-20 00:18:28 -08:00
269a6410a0
add EventManager event OnCrossAgentToNewRegion
2014-02-19 17:52:38 -08:00
c26f01ff8c
varregion: make scene default draw distance to be the maximum size of the
...
region. This is a temp fix for the use of draw distance to compute child
regions. Eventually must use the draw distance from the viewer for the
computation.
2014-02-19 09:51:49 -08:00
fc9930e420
Repair check for if in region position (I mean || is kinda like &&).
2014-02-15 18:49:40 -08:00
79200ed270
Fix displacement and location operations on legacy trees and grass in
...
the 'load oar' and 'scene' commands. Before they were ignored but the
code now relies on the SOG.IsAttachment function for attachmentness.
2014-02-15 17:10:20 -08:00
7fc289c039
Properly restore position on crossing failure for mega-regions.
...
Fix odd "cannot cross into banned parcel" viewer error message when crossing
into non-existant region. Proper permission failure messages are now returned.
2014-02-15 17:02:53 -08:00
877bdcdce1
Rewrite of mega-region code to use new form of border checking.
...
This commit eliminates all of the 'border' class and list code and replaces
it with testing if in the current region.
Impacts: can make a mega-region out of varregions of the same size; and
mega-region combinations must be rectangular (not square but rectangular)
2014-02-15 16:01:43 -08:00
bdbbeaa494
Non-functional changes of numbers into symbolic references and a few
...
comments on what variables really mean.
2014-02-15 16:01:01 -08:00
4fed301e65
Don't request group information in SP.MakeRootAgent() if the presence belongs to no group (UUID.Zero)
...
This was trigger the XmlRpcGroups errors described in http://opensimulator.org/mantis/view.php?id=6986
Introduced in commit 5b73b9c4
2014-02-14 23:43:07 +00:00
733e067958
Log information about which function, request data and agent ID triggered an XmlRpcGroupsServiceConnector error
2014-02-14 21:28:45 +00:00
ffd0da23fb
Merge branch 'justincc-master'
2014-02-14 00:16:17 +00:00
f49d513089
Change warns associated with UserAgentServiceConnector to debugs, as this is not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted).
...
This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
2014-02-14 00:08:13 +00:00
fc35b45e21
If calls to UserAgentServiceConnector fail then throw an exception. This lets the caller decide whether to discard the error or not.
...
This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
2014-02-14 00:01:12 +00:00
bc7fda39b4
Merge branch 'justincc-master'
2014-02-12 23:23:56 +00:00
e10012a7a6
If a caller tries to queue a CAPs message to a scene presence that has no event queue (e.g. an NPC), only warn if event queue debugging is greater than zero.
...
Removes the spurious log warnings if groups are active when NPCs are used.
Adds more regression tests associated with adding messages to the event queue
2014-02-12 23:18:10 +00:00
3a7c8d1f32
BulletSim: the minimum vehicle velocity was set too low so moving slow
...
was getting zeroed too easily. Added VehicleMinVelocity parameter.
2014-02-11 21:07:55 -08:00
c0cc5e0fa4
varregion: Send large region patches for wind and clouds.
2014-02-11 21:07:55 -08:00
b83a224147
Add JsonRezAtRoot script function. Operation is very similar to
...
llRezAtRoot except that the start parameter is a Json string that will
be unpacked into a json store identified by the objects uuid. This
makes a much more expressive (and simpler) way of passing initial
parameters to a rezzed object.
2014-02-09 18:07:49 -08:00
29c8461631
Remove the added whitespace, test concluded
2014-02-04 05:54:28 +00:00
8f372b8ac8
Bot test
2014-02-04 05:52:22 +00:00
342be228c6
Remove compile error from returning value in void function
2014-02-03 21:53:14 -08:00
1b41ec0a85
Fix raw32 terrain heightmap reader so it estimates terrain size from
...
the size of the input stream. This is required since the raw heightmap
format (.r32) does not contain any size information.
The estimation relies on terrain being square.
2014-02-03 21:23:32 -08:00
31cba5aa66
Add one check for a blank URL because the module wasn't quite sure not to work when unconfigured :|
2014-02-04 04:20:37 +00:00
1197658233
Adding the Avination XBakesModule, the client for the persistent bakes system
2014-02-04 02:09:39 +00:00
e1d1c27965
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2014-02-04 01:55:41 +00:00
49c2213a01
Dropping the rest of Avination's modified appearance code for core.
...
Module to follow.
2014-02-04 01:54:16 +00:00
41b6602a77
Add "--no-objects" parameter to 'load oar'.
2014-02-02 22:16:01 -08:00
8c6a0cb44a
Really add the old parameter names to load oar to keep downward compatibiliy
2014-02-02 17:18:08 -08:00
2a4dd34616
Change new 'load oar' parameters to be hyphenated to be consistant with
...
existing parameters. ('--forceterrain' becomes '--force-terrain').
The old forms have been kept for downward compatiblity.
2014-02-02 12:21:18 -08:00
9c97fb8e12
Implement terrain merging in TerrainChannel.
...
Modify archiver to use terrain merging when loading oars.
This makes displacement AND rotation properly work on terrain when loading oars.
Especially useful when loading legacy region oars into large varregions.
2014-02-02 11:17:49 -08:00
a8e64cd59a
Overload INPCModule.CreateNPC() to allow agentID to be specified. Note: this is intended for use in region modules and is not exposed to scripts.
2014-02-01 04:09:20 -08:00
abb193ec94
In UuidGatherer, gather materials referenced in the prim's TextureEntry
...
Signed-off-by: dahlia <dahlia@nomail>
2014-02-01 02:56:15 -08:00
b2878eb773
Merge branch 'justincc-master'
2014-01-31 00:51:22 +00:00
b8e22f02e7
Make sure Web streams are disposed after use
2014-01-31 00:44:22 +00:00
1380b37d71
Made error messages more consistent
2014-01-31 00:24:52 +00:00
3d62f4369d
Replaced throwing exceptions with calls to Error()
2014-01-31 00:24:47 +00:00
d405254971
Replaced llSay()ing LSL errors with calls Error()
2014-01-31 00:24:43 +00:00
9db4090c07
Replaced LSLError() calls with calls to Error()
2014-01-31 00:24:40 +00:00
c9550e473d
Updated "deprecated" LSL errors to use Deprecrated()
2014-01-31 00:24:36 +00:00
257f9cec40
Updated "not implemented" LSL errors to use NotImplemented()
2014-01-31 00:24:31 +00:00
13bb9ea682
Updated ShoutError() calls to use new LSL error methods
2014-01-31 00:21:22 +00:00
67ec95bde8
Updated methods for handling LSL script errors, deprecated, and not implemented
2014-01-31 00:20:10 +00:00
0842e2e15b
BulletSim: default physical terrain implementation to heightmap.
...
It originally looked like mesh terrain would perform better for vehicles
but, after much use, heightmap is the clear winner.
Force terrain implementation to heightmap if the physics region is
larger than legacy region size. This solves running out of memory for
very large regions.
2014-01-29 06:44:14 -08:00
fbf33ef1de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 22:42:35 -08:00
3f5c6c897f
One more run at fixing the sun module. Parameter setting fixed to
...
work through the OSSL interface. And setting the parameters now
adjusts all the dependent variables correctly so the sun moves
at the modified rate.
2014-01-28 22:40:39 -08:00
1900254e77
Restore brush tests with correct values and adjustments for new terrain height
...
rounding characteristics.
2014-01-28 21:43:18 -08:00
678c107915
Temporarily disable brush test. It will come back when tuning is complete.
2014-01-28 16:58:27 -08:00
dde0e547a7
Change area of brush test to account for rounding errors in terrain implementation
2014-01-28 16:48:34 -08:00
226b5e4d75
Increase the strength of brushes in brush test in an attempt to overcome rounding
...
introduced with new terrain height class.
2014-01-28 16:36:56 -08:00
cfe1bced7d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 16:34:49 -08:00
2877c7d94d
Actually make the parameter updates change the behavior of
...
sun movement.
2014-01-28 16:34:22 -08:00
0c3493f619
clear land tainting when tested. Then testing, pass scene to LandObject as now needed to get region size
2014-01-28 16:25:01 -08:00
d25265ae82
Fix terrain tests by properly initializing low detail terrain to zero height.
...
Also remove PI heightmap test as new heightmaps only have two significant digits.
2014-01-28 15:58:45 -08:00
bfb0011cd3
Some major surgery on the sun module. Updates to the client were gated
...
by a "mode" check. That mode check has been removed (it didn't result
in any change of behavior anyway). Also added a command line variable
update to set the sun position time offset (offset from the system
clock). Default is no offset to preserve existing behavior.
2014-01-28 15:43:47 -08:00
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
8eec717f5f
Merge branch 'master' into varregion
2014-01-28 08:50:28 -08:00
UbitUmarov