Melanie
aba078c93f
Fix perms when linking an object. Set root part perms to the perms
...
of the link set to make the build floater behave consistently.
Fixes permissions exploit introduced on 23 August.
2012-10-14 17:32:46 +02:00
Melanie
ce26730d4e
Allow bypassing perms dialog (console only)
2012-10-14 17:31:29 +02:00
Melanie
de3ff44406
Make texture sedning use only two threads to make things less harsh on bandwidth
2012-10-14 17:10:26 +02:00
UbitUmarov
1e03344411
missing file
2012-10-13 22:45:09 +01:00
UbitUmarov
5986b4ee39
add mesh cache expire on region startup. Expires will be relative to
...
previus expire (assumed done only once at startup). File 'cntr' on cache
folder stores time. Deleting it will force a skip on expire. Default time
is 48hours before previus startup to account for failed ones etc.
2012-10-13 22:30:34 +01:00
Justin Clark-Casey (justincc)
dc460579fd
minor: Fix and elaborate on log information printed when an unrecognized estate method is received from the client.
2012-10-13 01:47:10 +01:00
UbitUmarov
666fb744a3
retouch mesh ids
2012-10-13 01:41:18 +01:00
Justin Clark-Casey (justincc)
946c2e7e7c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-13 01:05:28 +01:00
Justin Clark-Casey (justincc)
330b976a62
Improve on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only performing HG regionflags service check if the region secret is not empty.
...
An empty RegionSecret is never HG, whilst a non-empty one may be HG or being genuinely used as a RegionSecret.
2012-10-13 01:03:09 +01:00
TBG Renfold
f6e166cd0b
Now using region flags for llRequestSimulatorData DATA_SIM_POS.
...
If the region is not classed a hypergrid region, then the region secret is checked to make sure that it is a valid UUID.
Just a temporary fix at this time.
2012-10-13 00:50:34 +01:00
UbitUmarov
9ada03bcdd
missing file (again)
2012-10-13 00:49:08 +01:00
UbitUmarov
48d2258f41
longer meshs identification keys, so first part on disk cache is it's asset id
2012-10-13 00:41:19 +01:00
UbitUmarov
13cb64a2c5
missing file
2012-10-12 23:46:48 +01:00
UbitUmarov
6e21796584
[TEST] disk cache meshs
2012-10-12 23:37:28 +01:00
Melanie
6ce93b22d1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-12 19:05:06 +01:00
Robert Adams
8c40215834
BulletSim: only use native sphere shape if it is a sphere.
2012-10-12 07:41:31 -07:00
Justin Clark-Casey (justincc)
fba59d905c
Get rid of accidental scene start left in ScenePresenceAutopilotTests
2012-10-12 03:20:27 +01:00
Justin Clark-Casey (justincc)
b9c2a1508e
Fix problems with regression tests by allowing invoke of Update() with a finite number of frames even if the scene isn't active.
2012-10-12 03:19:12 +01:00
Justin Clark-Casey (justincc)
b5a3c74a5c
Add "active true|false" to "debug scene" console command.
...
This allows the scene update and maintenance loops to be started and stopped for debug purposes.
2012-10-12 02:52:08 +01:00
Justin Clark-Casey (justincc)
b7e75d467c
minor: Use && instead of & when deciding whether to print Improve/ObjectUpdate packet out messages when debug is turned on.
...
Practical effect is probably none.
2012-10-12 02:10:30 +01:00
Justin Clark-Casey (justincc)
8873a4a8fc
minor: Fix bug in categorization of blocks reused stat from packetpool
2012-10-12 01:59:47 +01:00
Justin Clark-Casey (justincc)
21d0cbf703
Add AgentUpdate to PacketPool. This is the most common inbound packet from viewers.
2012-10-12 01:39:37 +01:00
Robert Adams
87a87ebb9a
BulletSim: fix problem with some shapes (like cylinders) being implemented as cubes.
2012-10-11 17:37:27 -07:00
UbitUmarov
a91be67a6e
commit the right files!
2012-10-12 00:39:58 +01:00
UbitUmarov
d5cfe1c0be
remove some more debug spam on ode
2012-10-12 00:36:01 +01:00
Justin Clark-Casey (justincc)
59a17ad676
Fix percentage stats to multiply by 100. Adjust container name for packetpool stats.
2012-10-12 00:26:15 +01:00
Justin Clark-Casey (justincc)
8a402850dd
Enable reuse of data blocks for ImprovedTerseObjectUpdate using existing Packetpool code.
2012-10-12 00:21:45 +01:00
Justin Clark-Casey (justincc)
2e9ef015f7
Fix packetpool for ImprovedTerseObjectUpdate packets.
...
These were neither being returned or in many places reused.
Getting packets from a pool rather than deallocating and reallocating reduces memory churn which in turn reduces garbage collection time and frequency.
2012-10-11 23:58:37 +01:00
Justin Clark-Casey (justincc)
f5f5f2e3fb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-11 23:56:03 +01:00
Justin Clark-Casey (justincc)
1f2472d0fc
Extend "show stats" command to "show stats [list|all|<category name>]"
...
This allows different categories of stats to be shown, with options to list categories or show all stats.
Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism.
This commit also adds percentage stats for packets and blocks reused from the packet pool.
2012-10-11 23:28:53 +01:00
Robert Adams
b24190ec98
BulletSim: remove some unused API2 calls because they were removed from Bullet 2.81
2012-10-11 14:01:29 -07:00
Robert Adams
5b82f18d64
BulletSim: normalize physics FPS to 45 (for real this time).
2012-10-11 14:01:25 -07:00
Robert Adams
a86fedd25f
BulletSim: normalize physics FPS to 45.
2012-10-11 14:01:22 -07:00
Robert Adams
3a458e2a36
BulletSim: Use full linkset mass when computing vehicle gravity force. Add taint-time specification to new AddForce().
2012-10-11 14:01:18 -07:00
Robert Adams
919569f6ec
BulletSim: Change defaults for constraint CFM and ERP to make large linksets more rigid. Remove mass calculation for terrain (it should stay a static object).
2012-10-11 14:01:14 -07:00
Robert Adams
a791620622
BulletSim: cosmetic changes (comments and renaming). Give mass to terrain to improve interactions.
2012-10-11 14:01:10 -07:00
Robert Adams
68698975f1
BulletSim: Add Force* operations to objects to allow direct push to engine.
...
Update BSDynamics to use same (don't want to delay updates til next taint-time.
Suppress queuing a taint update for position and orientation calls if value
does not change.
Move Bullet timing statistics call from C# back to C++ code.
Throttle taints per simulation step and add parameter to set.
By default, don't create hulls for physical objects. Add a
parameter to turn on and off.
2012-10-11 14:01:07 -07:00
Robert Adams
87825b0abe
BulletSim: Fix crash when linking large physical linksets.
...
Properly remove and restore linkage constraints when upgrading
a prim's mesh to a hull.
Lots more debug logging.
Definitions and use of Bullet structure dumping.
Centralize detail logging so a Flush() can be added for debugging.
2012-10-11 14:01:03 -07:00
Melanie
01f498bfb4
Remove spammy debug for IM
2012-10-11 21:10:25 +02:00
Justin Clark-Casey (justincc)
b768c35f6f
Assign endVector before control leaves ObjectCommandsModule.TryParseVectorRange() in order to fix mono 2.4.3 compile failure.
...
This doesn't fail the compile on mono 2.10.8.
2012-10-11 00:05:34 +01:00
Justin Clark-Casey (justincc)
efd9791506
Add "delete object pos <start-coord> to <end-coord>" console command.
...
This allows one to delete objects within a certain volume.
See help on console for more details.
2012-10-10 23:30:48 +01:00
Justin Clark-Casey (justincc)
756ac4f321
Correct osSetContentType() threat check to query osSetContentType rather than osSetResponseType
2012-10-10 01:39:47 +01:00
UbitUmarov
d554c0d574
normalize quaternion.Slerp outputs
2012-10-10 01:37:59 +01:00
Justin Clark-Casey (justincc)
11d8119a21
Remove osDropAttachment threat level check wrongly placed in OSSL_Api.ShoutErrorOnLackingOwnerPerms.
2012-10-10 01:37:57 +01:00
UbitUmarov
8fa91686db
add some quaternion normalizations to keep errors under control
2012-10-10 00:57:33 +01:00
Justin Clark-Casey (justincc)
528085adef
minor: Add method doc to EventManager.OnNewClient, OnClientLogin, ClientClosed, OnRemovePresence that any long-running operations should be launched on a thread separate to the event thread.
2012-10-10 00:48:20 +01:00
UbitUmarov
c0cdeec4c0
debug
2012-10-10 00:36:06 +01:00
Justin Clark-Casey (justincc)
e76b01a201
Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established.
...
This should remove the need to run the console command "kick user --force" when these connections are left around.
2012-10-10 00:26:43 +01:00
UbitUmarov
a19a189fec
fix debug :)
2012-10-09 23:01:26 +01:00
UbitUmarov
e238ece327
debug...
2012-10-09 22:57:28 +01:00
Justin Clark-Casey (justincc)
a3c0e3ed26
minor: elaborate method doc on Scene.NewUserConnection()
2012-10-09 22:19:47 +01:00
UbitUmarov
ce497ce379
debug...
2012-10-09 19:43:06 +01:00
teravus
7e90ea3551
av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - No Avatar Avatar Collisions. This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment.
2012-10-09 10:41:16 -04:00
teravus
764270a0d8
Add config option to plant avatar where they are reducing avatar avatar 'pushability' av_planted see OpenSimDefaults.ini. Use when you have unruly visitors that rudely push each other around. Still allows a small amount of movement based on the avatar movement PID controller settings. You can increase the spring tension in the PID controller and really prevent any movement if you would like.
2012-10-09 09:26:11 -04:00
UbitUmarov
315f3ee0e5
avoid crashing so debug is seen
2012-10-09 05:21:09 +01:00
UbitUmarov
d0773dcd6a
another debug msg
2012-10-09 05:09:43 +01:00
UbitUmarov
8717541288
force allocation of mesh data on creation ( messy code version )
2012-10-09 04:31:50 +01:00
UbitUmarov
5ef48c5980
temporary debug code
2012-10-09 02:57:51 +01:00
Justin Clark-Casey (justincc)
73c9abf5f2
Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
2012-10-09 01:35:27 +01:00
UbitUmarov
4c512ada58
fire a extra terseupdate when stopping (like in loosing physics). In some
...
cases things seem not to stop
2012-10-09 01:04:29 +01:00
UbitUmarov
2e223c8ce2
Change ray to land colision range limitation so it has no impact on other
...
geom types
2012-10-09 00:44:02 +01:00
UbitUmarov
3bf7201fd4
move terrain geom to own ode space. Limit range on raycast if includes
...
terrain until ode doesn't eat all stack. Add a pre-simulation method to do
pending actors changes (except mesh assets still not ready to use), to be
optionaly called before firing heartbeat. [UNTESTED]
2012-10-09 00:18:39 +01:00
Dan Lake
d342adaa87
Merge branch 'master' of git://opensimulator.org/git/opensim
2012-10-08 15:25:26 -07:00
Melanie
8894f4ad77
Change permissions on child prim inventory items when god mode "force
...
permissive" is used.
2012-10-08 01:34:32 +02:00
UbitUmarov
a1fcfe8677
a few changes/fix (?)
2012-10-07 23:54:15 +01:00
UbitUmarov
48d8fbc9ae
bug fix + make costs visible for testing
2012-10-07 08:53:55 +01:00
UbitUmarov
a0b4e68060
refix so we can compile it, loosing alpha scultps fix on core meshmerizer
2012-10-07 06:33:13 +01:00
UbitUmarov
c42df1259f
fix wrong file commited
2012-10-07 06:16:47 +01:00
UbitUmarov
03ef125ba0
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-10-07 06:13:24 +01:00
UbitUmarov
4a87a8f3b9
comment out a spam coment on core Meshmerizer
2012-10-07 06:11:51 +01:00
UbitUmarov
4efc90ef37
i update core ode plugin and make it load is meshs (i hope)
2012-10-07 05:53:52 +01:00
Melanie
9be2d5c77d
Fix merge issues
2012-10-07 03:03:24 +01:00
Melanie
f7df68d922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 02:48:28 +01:00
UbitUmarov
78ce7a0a04
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
2012-10-07 01:20:52 +01:00
Justin Clark-Casey (justincc)
13c4fd7271
refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents
2012-10-06 04:06:27 +01:00
Justin Clark-Casey (justincc)
9de991301c
Make UserSessionID a class rather than a struct, so that later updates to value suceed (rather than having to pull the data out and reinsert back into the Dictionary).
...
Fixes http://opensimulator.org/mantis/view.php?id=6338
2012-10-06 04:04:50 +01:00
Justin Clark-Casey (justincc)
16c9c1dff7
On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates.
...
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
2012-10-06 02:34:49 +01:00
Dan Lake
91ca3117cb
Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full update. There should be a better way to indicate which properties have changed that is non LLUDP-centric
2012-10-05 17:32:07 -07:00
Dan Lake
6f220a8679
Trigger ObjectAddedToScene when loading objects from oarfile. Already triggers when creating, duplicating or loading from database, incoming attachments, etc
2012-10-05 17:30:27 -07:00
UbitUmarov
5254c0de8f
Merge branch 'avination' into ubitwork
2012-10-05 06:00:45 +01:00
Justin Clark-Casey (justincc)
1fb53e7103
Fix bug in implementation of "show part pos" that would not filter probably.
...
Also refactors more of ObjectCommandsModule to remove duplicate code
2012-10-05 04:31:43 +01:00
Justin Clark-Casey (justincc)
22f6fa49e3
Add "show part pos" console command to match "show object pos"
2012-10-05 04:22:08 +01:00
Justin Clark-Casey (justincc)
16feed456a
refactor: eliminate some now duplicate code in ObjectCommandsModule
2012-10-05 04:16:38 +01:00
Justin Clark-Casey (justincc)
130768b16a
Add "show object pos <start-coord> to <end-coord>" command to simulator console.
...
This allows you to display details of all objects in a given bounding box.
Values parts of the co-ord can be left out as appropriate (e.g. to get all objects between the ground and z=30.
See "help show object pos" for more details.
2012-10-05 03:52:42 +01:00
Justin Clark-Casey (justincc)
8cd1dc8d60
minor: Add missing license information from the top of IUserManagement
2012-10-05 02:07:28 +01:00
Justin Clark-Casey (justincc)
d87813a194
Finally fix build break by allowing UserManagementModule (which constructs a packet directly) to reference OpenSim.Region.ClientStack.LindenUDP.
...
This time I actually properly did a clean build
2012-10-05 02:02:19 +01:00
Justin Clark-Casey (justincc)
046113c137
Print number of objects found with "show object name" and "show part name" simulator console commands
2012-10-05 01:46:28 +01:00
Justin Clark-Casey (justincc)
03136df1a7
Forgot to actually remove the packetpool set code from scene.
2012-10-05 01:45:49 +01:00
Justin Clark-Casey (justincc)
7c7cdf3431
Read PacketPool config in LLUDPServer with other config params rather than in Scene.
...
This is to resolve previous build break.
This unnecessarily but harmlessly reads and sets the parameter multiple times - scene was doing the same thing.
2012-10-05 01:43:29 +01:00
Justin Clark-Casey (justincc)
f0178a6a41
refactor: Move OpenSim.Framework.PacketPool to OpenSim.Region.Clientstack.Linden.UDP
...
This is to allow it to use OpenSim.Framework.Monitoring in the future.
This is also a better location since the packet pool is linden udp specific
2012-10-05 01:12:56 +01:00
Melanie
637e9a10db
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-10-04 20:16:23 +01:00
Melanie
b977f962fa
Allow default animation to be stopped to be replaced with another one.
...
Fixes Mantis #6327
2012-10-04 15:42:52 +01:00
Melanie
efb9b7014e
Allow default animation to be stopped to be replaced with another one.
...
Fixes Mantis #6327
2012-10-04 15:20:04 +02:00
UbitUmarov
89d342b5ce
more changes and more non active code
2012-10-04 08:14:52 +01:00
UbitUmarov
113549c2e9
apply cmic fix to multi layer wearables
2012-10-04 05:29:32 +01:00
UbitUmarov
893b44497d
Merge branch 'avination' into ubitwork
2012-10-04 05:05:57 +01:00
UbitUmarov
51e1830f86
more changes. Most code not in use
2012-10-04 04:55:53 +01:00
Justin Clark-Casey (justincc)
aa52c8b20f
Output monitor data in response to console command on MainConsole.Instance rather than m_log
...
This should really be happening for all console commands (though many don't).
However, things might get difficult if both a console command and other code invoke the same paths.
2012-10-04 02:17:57 +01:00
Justin Clark-Casey (justincc)
3d36a6d55c
Add generic PercentageStat.
...
Not yet used.
2012-10-04 01:27:40 +01:00
Justin Clark-Casey (justincc)
e717398f6c
Add experimental "slow frames" stat, available in "show stats" and via the monitoring module.
...
This increments a SlowFrames counter if a frame takes over 120% of maximum time.
This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic.
This is more granualar than asking objects to create their own reports.
At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
2012-10-04 00:32:42 +01:00
teravus
a2ab3b88de
Soliciting for comments on smoothness of physics objects for this build.
...
This introduces expected contact point hints to the ODE Collider to better determine when to throttle updates as excessive. This /should/ smooth physics objects out again, however, I cannot know every configuration of OpenSimulator, so I'm requesting that testers please examine this change on their build.
Thanks!
2012-10-03 18:30:44 -04:00
UbitUmarov
a9f2bc150f
missing changed file
2012-10-03 23:18:35 +01:00
UbitUmarov
9988558ec1
meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled
...
for all physics engines)
2012-10-03 23:14:56 +01:00
UbitUmarov
4f51cc325c
making meshworker have more work..
2012-10-03 20:36:41 +01:00
UbitUmarov
7137b234b4
introduce a ODEMeshWorker class, should be pure cosmetic changes for now
2012-10-03 19:33:28 +01:00
Mic Bowman
b9baab5521
Fix the use of the wrong index when locating the assets associated
...
with wearables. The fact that this hasn't caused problems earlier
suggests either that no one is using multiple layers of wearables or
that this code is useless because the assets are coming in with the
wearables request.
2012-10-03 10:45:57 -07:00
Melanie
8a552ac907
Merge branch 'master' into careminster
2012-10-03 17:40:13 +01:00
Melanie
bf565e9747
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-03 17:40:11 +01:00
Melanie
653a98e891
Fix a viewer crash issue
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-03 17:39:13 +01:00
Melanie
fdacb88b29
Fix a viewer crash issue
2012-10-03 17:11:02 +02:00
teravus
e56ef2720e
I propose that 0.5m/step change for linear velocity is too big of a change to control the reporting of a new angular velocity. I think that this could be here for one of two reasons, 1. vehicles and llMoveToTarget with axis lock, or 2. To attempt to make things look more stable in the physics scene then they really are, however, this also really affects the angular velocity reporting negatively causing things to spin wildly and jump back into place repeatedly. To compromise, if the prim is a vehicle or is being used as a motor target, the original functionality is still applied. If that's not the case, angular velocity is reported with a linear velocity of 0.02m/step. To be clear on the effect of the physical world... When you push things, there's still a lag time where you walk into the object but once the object is in motion, it begins to move as you would expect so results in slightly more realistic motion.
2012-10-03 02:30:23 -04:00
teravus
df3d1d1301
Minor Modification, switch /2 to 0.5f in ODEPrim.Velocity
2012-10-02 23:14:35 -04:00
Melanie
23d5bafa7f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-10-03 00:24:33 +01:00
Melanie
f433ee317b
Attempt to fix Mantis #6311 . Honor a destination folder if one is given
2012-10-02 23:03:52 +01:00
Melanie
ca5c0814f4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-10-02 23:02:53 +01:00
Melanie
f1886c449c
Attempt to fix Mantis #6311 . Honor a destination folder if one is given
2012-10-02 23:02:01 +01:00
SignpostMarv
a1679517d3
correcting typo
2012-10-02 22:14:47 +01:00
SignpostMarv
f555febdb7
taking into account the recent introduction of implicit operators
2012-10-02 22:14:46 +01:00
SignpostMarv
ce7694c108
added perms checking, duplicated functionality to methods that do not require perms and have higher threat level
2012-10-02 22:14:46 +01:00
SignpostMarv
c677c04f10
fixing copypasta
2012-10-02 22:14:46 +01:00
SignpostMarv
35b7c80e0b
implementing osDropAttachment & osDropAttachmentAt
2012-10-02 22:14:46 +01:00
Robert Adams
210f227fe6
BulletSim: Make parameter value defaults match what should be the default and what is in OpenSimDefaults.ini. Comment and debug printout changes.
2012-10-02 11:14:15 -07:00
Robert Adams
ce47d0c454
BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its children of BSPrim and BSCharacter.
2012-10-02 11:14:09 -07:00
Robert Adams
d8a786870b
BulletSim: Fix problem where box shapes were not being rebuilt if the shape type changed.
2012-10-02 11:14:03 -07:00
Robert Adams
ce97ebdc88
BulletSim: Fix linkset problem where delayed manipulations of child objects was using the child shape address at call time rather than the one created at taint time.
2012-10-02 11:13:57 -07:00
Robert Adams
b6b505163c
BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is no lag between what the vehicle code sees and what the physics engine is using.
2012-10-02 11:13:51 -07:00
Robert Adams
1e5869dcf6
Add Flush() method to LogWriter. Also correct line endings to Linux form.
2012-10-02 11:13:45 -07:00
Robert Adams
f2c78281ce
BulletSim: fix the FloatOnWater code so avatars can normally go underwater.
2012-10-02 11:13:39 -07:00
Robert Adams
33617e09a1
BulletSim: impliment FloatOnWater OS function.
2012-10-02 11:13:32 -07:00
Robert Adams
c1740a2903
Correct my name in CONTRIBUTORS.txt
2012-10-02 11:13:26 -07:00
Robert Adams
5221f2421e
BulletSim: remove warnings for unused variables.
2012-10-02 11:13:20 -07:00
Melanie
54ec8b197b
Add money event routing to the script engine.
2012-10-02 01:25:55 +01:00
Melanie
14b659e550
Send money() events to the clicked prim. Reverting a change I made over a year ago.
2012-10-02 01:17:46 +01:00
Melanie
402128bb53
Prevent the ExtraSettings code from crashing SQLite driven sims.
2012-10-02 00:51:38 +01:00
Melanie
7cc89cdadc
Add using clause I missed
2012-09-30 15:57:49 +01:00
Melanie
f8a4b61954
Allow up to 12 simultaneous connections to a given endpoint rather than 2
2012-09-30 15:49:51 +01:00
Diva Canto
91a5c602e3
Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow ."
...
But the patch is here, in case anyone wants to try it.
This reverts commit 531edd51d8
.
2012-09-30 07:48:03 -07:00
Diva Canto
531edd51d8
Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow .
...
Thanks R.Gunther (rigun@rigutech.nl ) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
2012-09-30 07:22:55 -07:00
Melanie
944b1ed237
Merge branch 'avination' into careminster
2012-09-29 21:47:08 +01:00
Melanie
71dd55a1ce
Merge branch 'master' into careminster
...
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-09-29 19:21:07 +01:00
Justin Clark-Casey (justincc)
818379ba14
Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object is attached from the scene.
...
Enables previously disabled regression test.
Based on SingpostMarv's patch in http://opensimulator.org/mantis/view.php?id=6302 but I prefer a simpler approach that does not expose a resume scripts option right now.
2012-09-29 01:14:23 +01:00
Justin Clark-Casey (justincc)
fae869c4ca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-29 00:09:12 +01:00
Justin Clark-Casey (justincc)
d588467d5b
Extend attachment regression test to check for appropriate attach event firing.
...
This reveals that the event is not being fired when an object is attached from ground, which is incorrect.
This check is temporairly disabled.
2012-09-29 00:07:11 +01:00
Robert Adams
76e9cc41bd
BulletSim: remember to release the physical body and shape when a prim is destroyed. This fixes many problems with physical linksets.
2012-09-28 12:34:50 -07:00
Robert Adams
6f89975526
BulletSim: add separate runtime and taint-time linkset children lists to keep the creation of constraints separate from runtime.
2012-09-27 22:02:13 -07:00
Robert Adams
74dea4cfd5
BulletSim: rename some constraint variables to be consistant with other name use.
...
Added callbacks for shape and body changes in GetBodyAndShape() so the linkset
constraints can be picked up and restored. A better design might be to have
a "prim shape changed" event. Think about that.
Added constraint types to general constraint class.
2012-09-27 22:02:08 -07:00
Robert Adams
7b65985047
BulletSim: remove the trailing spaces from lines to make git happier
2012-09-27 22:02:03 -07:00
Robert Adams
5781d4d52d
BulletSim: remove the unused body management code from BSPrim. There is no going back now.
2012-09-27 22:01:57 -07:00
Robert Adams
f82b903dee
BulletSim: Fix linkset crash. Caused by the different body and shape
...
pointers at runtime and at taint-time. Now passes the body into the
taint.
Vehicles zero inertia when active to eliminate Bullet's contribution
to vehicle motion.
2012-09-27 22:01:52 -07:00
Robert Adams
4589bc84a3
BulletSim: Terrain sets proper collision flags on creation.
...
Static objects are set to ISLAND_SLEEPING rather than DISABLE_SIMULATION.
Might reconsider this and, alternatively, have dynamic objects force activation.
Clean up use of DetailLog().
2012-09-27 22:01:47 -07:00
Robert Adams
735d89e369
BulletSim: btGhostObjects working to make 'volume detect' work.
...
Rearrangement and cleanup of shape collection code. Much more readable.
Enabling and use of collision filters and masks.
Addition of ID to body creation BulletSimAPI calls so always set in
shape for collision reporting.
Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder
from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE
which makes volume detect fail.
2012-09-27 22:01:42 -07:00
Robert Adams
d016051fa0
BulletSim: renamed members of BulletShape, BulletSim and BulletBody
...
so the members case is consistant. Caused modifications everywhere.
New logic in BSShapeCollection to track use and sharing of shapes.
I just reslized, though, that shapes cannot be shared because the
shape's UserPointer is the localID of the prim and is required
for tracking collisions. More changes coming.
Added DuplicateCollisionShape2() to API and changed BuildNativeShape2
to take a ShapeData structure so don't have to pass so many parameters.
This matches the latest version of BulletSim.dll.
Additions and removal of DetailLog() statements for debugging.
2012-09-27 22:01:37 -07:00
Robert Adams
42802669dd
BulletSim: fix regression that caused cylindar shapes to have a box collision shape
2012-09-27 22:01:31 -07:00
Robert Adams
22290ef35a
BulletSim: complete code for managed code shape and body tracking. Not debugged.
...
Eliminate some null exceptions created adding the above code.
Add and remove some detailed logging statements.
2012-09-27 22:01:26 -07:00
Robert Adams
a27e4ce6cb
BulletSim: add class and infrastructure for shape and object
...
tracking in the C# code. Needed for the changing body type
(to and from GhostObjects) for volumeDetect.
2012-09-27 22:01:21 -07:00
Robert Adams
91efccabdc
BulletSim: Convert BSCharacter to use common BSPhysObject code and variables.
...
Fix avatar height calculation to properly account for the capsule ends.
Rearrange some locking in TerrainManager to eliminate possible race conditions.
Move DetailLog() definition into common BSPhysObject class.
Some variable renaming to make usage clearer (refactor.rename makes this so easy).
2012-09-27 22:01:16 -07:00
Robert Adams
ee7cda261c
BulletSim: move a bunch of common logic out of BSPrim and BSCharacter
...
and into the parent class BSPhysObject.
Rework collision logic to enable extra collision after done colliding.
Rename 'Scene' to 'PhysicsScene' to differentiate it from the simulator 'Scene'.
2012-09-27 22:01:11 -07:00
Justin Clark-Casey (justincc)
3db10fdbef
Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concurrent thread use provoking mono crashes.
...
Same rationale as commit 13690582
.
2012-09-28 01:50:21 +01:00
Melanie
f05ca1a0fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-28 00:15:58 +02:00
Melanie
7e21ddeeff
Fix a possible NRE
2012-09-28 00:15:14 +02:00
UbitUmarov
58e55ae075
make some forgotten changes be done by simulation thread not by caller
2012-09-27 23:14:42 +01:00
Melanie
001ec0e2e6
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-27 17:29:44 +01:00
Melanie
b52311b8f8
Remove a core undo call that we don't need.
2012-09-27 17:16:39 +01:00
Justin Clark-Casey (justincc)
9eca154bce
Make it possible to rescale SOGs when they are not in a scene.
2012-09-27 15:48:47 +01:00
Melanie
637f5440fe
Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster
2012-09-27 15:46:35 +01:00
Justin Clark-Casey (justincc)
fdd4361928
Fix very recently introduced race condition where a CreateNewItem outracing an UploadAsset request could throw an exception because m_asset did not yet exist.
...
This was accidentally introduced in 4fc0cfb
This commit also consistently removes the AssetXferUploader when the transaction completes, no matter if it completed on asset upload or item operation.
The amount of data being retained was small, since this was clothing/bodypart metadata in the asset rather than textures themselves.
2012-09-27 15:28:43 +01:00
Justin Clark-Casey (justincc)
7d6ac75f87
Comment out old m_storeLocal from AssetXferUploader.
...
This was only used if none of new item, update item or update task item had been set.
But since all transactions go through these paths this old code is redundant.
2012-09-27 15:27:56 +01:00
Justin Clark-Casey (justincc)
5c8b9ff9ed
Insert transaction ID into AssetXferUploader constructor rather than at UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first.
...
This was preventing the previous race condition fix in 4fc0cfb
from actually working.
This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions.
2012-09-27 15:27:25 +01:00
Justin Clark-Casey (justincc)
65e294267d
Move UDP update task item code to AssetXferUploader to match existing create user item and update user item mechanisms
...
This is done for consistency and to allow removal or some access methods that increase code complexity.
However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
2012-09-27 15:26:58 +01:00
Justin Clark-Casey (justincc)
1a902fceb5
Fix occasional race condition failure when creating new clothing/body parts in the viewer or updating existing assets.
...
On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem.
It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail.
So instead we always set up a Xfer object on either the asset or inventory item update request.
This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
2012-09-27 15:25:32 +01:00
Melanie
daf84d7385
Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminster
2012-09-27 12:39:24 +01:00
Justin Clark-Casey (justincc)
2bf42f30af
Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.
...
This controls how many undo steps the simulator will store for each prim.
Default is now 20 rather than 5 as it briefly was.
The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
2012-09-27 00:12:34 +01:00
Justin Clark-Casey (justincc)
b9934fc4db
Don't store undo states if a scene object is manipulated when it is not in a scene.
...
Adds regression test for this.
2012-09-26 23:31:10 +01:00
Justin Clark-Casey (justincc)
31c636f1e4
refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.
2012-09-26 23:25:50 +01:00
Justin Clark-Casey (justincc)
36e3123069
Make it possible to rescale SOGs when they are not in a scene.
2012-09-26 23:17:21 +01:00
Justin Clark-Casey (justincc)
327320d1a7
Enforce existing 5 action hardcoded undo limit.
...
This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source.
This commit enforces that limit, which will soon become configurable.
Regression test for undo limit added
Should help with http://opensimulator.org/mantis/view.php?id=6279
2012-09-26 22:49:44 +01:00
Justin Clark-Casey (justincc)
21f30a1b5f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-26 22:49:05 +01:00
Melanie
2998a2df6a
Streamline and improve llGetMass
2012-09-26 22:30:09 +02:00
Justin Clark-Casey (justincc)
90dd5844d6
Add basic undo/redo regression tests.
2012-09-26 21:28:43 +01:00
Diva Canto
3c77b8f463
Use GridUser properly for foreign users.
2012-09-26 12:40:41 -07:00
Diva Canto
80133f9ebe
Show the user's home url too on the console command.
2012-09-26 11:27:31 -07:00
Diva Canto
2f61763923
Not really a change, just added a reminder to fix something here.
2012-09-26 11:26:51 -07:00
UbitUmarov
617f1b9223
just remove the damm thing
2012-09-26 16:17:49 +01:00
UbitUmarov
7e3eba1064
Seems nothing actually need the request body for getevents. so change
...
control flag to false
2012-09-26 15:41:57 +01:00
UbitUmarov
abb4b9fcae
UriModule GetEvents also doesn't need a request body
2012-09-26 15:11:59 +01:00
Diva Canto
7d2cd0d935
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 20:04:10 -07:00
Diva Canto
ae58cf4224
TOS module. WARNING: migration in GridUser table.
2012-09-25 20:03:49 -07:00
Diva Canto
495a3e7daf
Oops, that should be inside the curly bracket.
2012-09-25 19:54:42 -07:00
UbitUmarov
654dd289f2
more changes to PollService
2012-09-26 03:05:27 +01:00
Justin Clark-Casey (justincc)
ddd9384b39
Fix very recently introduced race condition where a CreateNewItem outracing an UploadAsset request could throw an exception because m_asset did not yet exist.
...
This was accidentally introduced in 4fc0cfb
This commit also consistently removes the AssetXferUploader when the transaction completes, no matter if it completed on asset upload or item operation.
The amount of data being retained was small, since this was clothing/bodypart metadata in the asset rather than textures themselves.
2012-09-25 23:30:25 +01:00
Justin Clark-Casey (justincc)
b96a53962b
Comment out old m_storeLocal from AssetXferUploader.
...
This was only used if none of new item, update item or update task item had been set.
But since all transactions go through these paths this old code is redundant.
2012-09-25 23:13:45 +01:00
Justin Clark-Casey (justincc)
eb5bec96e4
Insert transaction ID into AssetXferUploader constructor rather than at UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first.
...
This was preventing the previous race condition fix in 4fc0cfb
from actually working.
This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions.
2012-09-25 22:54:20 +01:00
Justin Clark-Casey (justincc)
2f795e4fa6
Move UDP update task item code to AssetXferUploader to match existing create user item and update user item mechanisms
...
This is done for consistency and to allow removal or some access methods that increase code complexity.
However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
2012-09-25 22:08:11 +01:00
Justin Clark-Casey (justincc)
4fc0cfba3c
Fix occasional race condition failure when creating new clothing/body parts in the viewer or updating existing assets.
...
On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem.
It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail.
So instead we always set up a Xfer object on either the asset or inventory item update request.
This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
2012-09-25 21:35:39 +01:00
Diva Canto
77355295da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 10:46:42 -07:00
Diva Canto
4ec2fc4cc2
Deleted extraneous debug message
2012-09-25 10:46:21 -07:00
UbitUmarov
ef3d44240e
missed change
2012-09-25 04:03:15 +01:00
UbitUmarov
4d681bfde6
do the same to webFecthInvDescModule
2012-09-25 03:59:19 +01:00
UbitUmarov
2cb17d6fbb
change GetTextureModule processing
2012-09-25 03:38:45 +01:00
SignpostMarv
020103c51e
Documenting object-related events
2012-09-24 22:59:02 +01:00
Justin Clark-Casey (justincc)
ac02cadbdb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-24 22:52:33 +01:00
SignpostMarv
1cfd63d0b4
Documenting LSL script-related events
2012-09-24 22:44:37 +01:00
Melanie
421071bd8a
Text changes for upload messages
2012-09-24 23:19:57 +02:00
UbitUmarov
a1a0a90720
more upload changes (plus untouch prebuild.xml)
2012-09-24 22:57:33 +01:00
UbitUmarov
ca67ee60ac
add missing transactionID in SendInventoryItemCreateUpdate. and make use
...
of it on inventoryAccessModule, etc. Most likelly it's needs where there
is a transactionID not zero
2012-09-24 21:22:08 +01:00
Melanie
bbaf2c5a80
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-24 20:14:00 +01:00
Melanie
ca9d3760ab
Merge branch 'ubitwork' into avination
2012-09-24 17:41:48 +02:00
Melanie
6963b96bd0
If an asset upload transaction doesn't exist for a CreateInventory request,
...
simply process it as if UUID.Zero had been given.
2012-09-24 13:41:48 +02:00
Melanie
68ece236a6
Protect the responses map with a lock. Also remove ugly "this." type of
...
member notation.
2012-09-23 23:55:28 +02:00
Melanie
a5d969d92f
Comment out asset error for sculpts/meshes. If an asset is missing it's missing.
...
We can't put it back so we don't need to know.
2012-09-23 20:57:36 +02:00
Melanie
291e57afb4
Merge branch 'ubitwork' into avination
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
2012-09-23 19:18:49 +02:00
UbitUmarov
64db9e4114
try to allow free uploads for testing, if users prefix names with "TEST-". Let
...
textures get into inventory again. Both features under config control.
Have direct warnings to client, including a final one on upload complete
since i see nothing. problems: textures don't showup in inventory til
relog, also issues with permitions. A few more changes
2012-09-23 15:04:10 +01:00
Diva Canto
1c42337381
HG Rez object: warn the user if the item or asset cannot be found.
2012-09-22 14:41:19 -07:00
Diva Canto
87d810217e
Guard against inventory get failures.
2012-09-22 14:01:51 -07:00
UbitUmarov
11e05217df
report asset upload errors the right away
2012-09-22 21:14:15 +01:00
UbitUmarov
4bba72b7af
removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some
...
more needed fields in request
2012-09-22 16:47:15 +01:00
UbitUmarov
7de67d5680
removed unused data in MeshUploadFlag response
2012-09-22 12:00:14 +01:00
Diva Canto
ebd99c9e3e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 17:59:42 -07:00
Diva Canto
21a6ef5bb6
This fixes HG attachments' missing assets (textures, etc).
...
Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again.
2012-09-21 17:58:44 -07:00
Justin Clark-Casey (justincc)
b36ef60aca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 01:05:33 +01:00
SignpostMarv
8d7b1f8aa0
Documenting non-LSL script-related events
2012-09-22 00:57:29 +01:00
Diva Canto
b0da4b8d13
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 16:45:35 -07:00
Diva Canto
cfa022700d
Moved the small HGUuidGatherer class to the file where its parent class is. No need to keep 2 separate files.
2012-09-21 16:45:16 -07:00
Justin Clark-Casey (justincc)
9ab5c5040d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 00:26:32 +01:00
Justin Clark-Casey (justincc)
5df3944607
Fix llListFindList() returning no match when there is a match with a script constant component in the source list.
...
Adds regression test for this case.
Based on http://opensimulator.org/mantis/view.php?id=6156
Thanks SignpostMarv.
2012-09-22 00:23:25 +01:00
Diva Canto
fb2ace6fff
Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already downloads the assets, so we don't need to do it again...
2012-09-21 15:55:58 -07:00
Diva Canto
f931c0a868
Minor: may avoid crashes of sims that still don't have this configuration section.
2012-09-21 15:04:41 -07:00
Diva Canto
f4cc19968c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 07:45:26 -07:00
Diva Canto
b542622b3a
HG 2.0: added asset import/export policies at the sim too.
2012-09-21 07:44:18 -07:00
Diva Canto
5f97b3e1d9
Minor: change the return value of unsuccessful posts to string.Empty.
2012-09-21 06:41:32 -07:00
UbitUmarov
f9c24c9414
read model upload cost parameters from config [Economy] section
2012-09-21 11:50:14 +01:00
Justin Clark-Casey (justincc)
632a42e2b1
Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical.
2012-09-21 01:57:13 +01:00
Justin Clark-Casey (justincc)
bceef401fa
Simplify UuidGatherer by performing asset fetch synchronously rather than using the async call but waiting for completion anyway!
2012-09-21 01:36:23 +01:00
Diva Canto
33aa6d172f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-20 15:51:27 -07:00
Diva Canto
3089b6d824
More HG2.0: Added permission policies in HGAsset Service based on asset types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
2012-09-20 15:49:22 -07:00
Melanie
5d63c20122
refix prior commit
2012-09-20 15:41:16 +02:00
Melanie
9ff6c85325
Make uploads free for now - we will have to announce this
2012-09-20 15:39:46 +02:00
UbitUmarov
bf987f96d2
Fix model upload rotations and offsets ( i hope )
2012-09-20 14:32:30 +01:00
Justin Clark-Casey (justincc)
b481a78234
Don't fail to create an IRC nick if nick randomization is disabled in the IRC module.
...
Patch from http://opensimulator.org/mantis/view.php?id=6293
Thanks Starflower.
2012-09-20 02:01:01 +01:00
SignpostMarv
d667f9d260
Documentation of teleport-related events
2012-09-20 01:56:18 +01:00
SignpostMarv
696b3f66c4
minor tweaks to existing comments for IDE goodness
2012-09-20 01:50:40 +01:00
SignpostMarv
49e2872f9e
Documentation of agent-related events
2012-09-20 01:50:40 +01:00
SignpostMarv
61f4523e01
Documentation of object-related events
2012-09-20 01:48:50 +01:00
SignpostMarv
a74167bb06
Documentation of OnPluginConsole
2012-09-20 01:47:03 +01:00
Justin Clark-Casey (justincc)
f2a9d26118
Make ResendAppearanceUpdates = true by default in [Appearance] in OpenSimDefaults.ini.
...
This resends appearance uuids to avatars in the scene once a minute.
I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet.
The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached.
This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
2012-09-20 01:40:05 +01:00
Melanie
629138d4fa
Change texture price back to 10 C$
2012-09-19 13:01:34 +02:00
UbitUmarov
5317b1053f
be more tolerant to small prims, skipping them, only failing if they are
...
more than half of total. Add a state control to NewFileAgentInventory
to avoid more than one at a time per client. ( Incomplete and possible not that good)
2012-09-19 03:53:51 +01:00
UbitUmarov
fb32604b41
create a single ModelCost provider for the caps instance. Let it know and
...
check scene prim size limits.
2012-09-19 01:33:16 +01:00
Justin Clark-Casey (justincc)
967d42d393
Correctly override and call base OpenSimTestCase.SetUp() method in GridConnectorsTests and ArchiverTests.
...
Remove unrelated compile warning from AttachmentsModuleTests.
2012-09-19 01:06:42 +01:00
UbitUmarov
51ca84afdf
coment out mesh model upload code to add textures and individual meshs
...
assets to inventory, since it may actually be a bad ideia since good
model textures are deply related to it and there is no current use for
independent mesh assets. Added the option to have a reduced free for textures (2.5 C$ as is, total textures cost rounded to nearest int) compensating for the fact that they can't be used outside the model or its parts.
2012-09-19 00:29:16 +01:00
BlueWall
9d973ec3b3
Cleanup from prev. commit
...
Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
2012-09-18 10:12:32 -04:00
BlueWall
d29fc53052
Fix some inconsistencies in configurartion: NonPhys prims
...
Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*.
Please update your OpenSim.ini and Regions.ini to reflect these changes.
2012-09-18 09:53:45 -04:00
Melanie
ac2380bbfa
Add booleans to control whether we actually crete inventory items
2012-09-18 02:12:07 +02:00
UbitUmarov
e8ba26eac8
***TEST*** still bad... create inventory itens for model textures and meshs. Issues: meshs get into root folder, viewer and viewer does not update inventory until relog ( the upload funtion needs to return more information) ,etc. Droping a mesh into a prim, makes viewer think we dropped a sculpt map, but it does work, viewer displays the mesh and physics work (as physics is stored at the sculpt information fields). Textures show up in Textures folder, just its to costly to find that default folder as is..
2012-09-18 01:07:44 +01:00
UbitUmarov
fd20ef5c91
add some locks to GetTextureModule
2012-09-17 22:35:36 +01:00
UbitUmarov
c1eec3b828
on upload store mesh list contents as mesh assets. Build prims by instances not
...
meshs. (some prims can have same mesh)
2012-09-17 21:15:07 +01:00
UbitUmarov
c3666c9ec3
make sure client still has money at upload
2012-09-17 19:38:05 +01:00
UbitUmarov
7f5b1182ef
same cleanup
2012-09-17 19:09:51 +01:00
UbitUmarov
1740325392
removed broken fee compression
2012-09-17 17:49:10 +01:00
Mic Bowman
91312daeb2
Moving ScriptModuleComms into the CoreModules tree.
2012-09-17 09:04:54 -07:00
UbitUmarov
df77724bbc
let mesh model estimator work even without money module, so other
...
estimations can work
2012-09-17 15:50:59 +01:00
UbitUmarov
5915dfc26f
Make use of mesh cost functions
2012-09-17 15:37:05 +01:00
Melanie
d739246030
Merge branch 'master' into careminster
2012-09-17 14:18:03 +01:00
SignpostMarv
0e5f5538bc
Documentation of IScriptModuleComms.RegisterConstant and IScriptModuleComms.LookupModConstant
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-17 14:15:52 +01:00
SignpostMarv
f9721573d9
Implementing ability to register script constants and invocations on a region module automatically
2012-09-17 14:15:47 +01:00
Melanie
1dd75fcdb4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-09-17 14:15:22 +01:00
UbitUmarov
5bbc4fb2a5
missing file for suport of mesh upload cost
2012-09-17 13:39:38 +01:00
SignpostMarv
c7948a669a
preventing a null reference exception from being thrown
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-17 13:29:15 +01:00
SignpostMarv
5e626ce55d
script invocations cannot have void return type
2012-09-17 13:29:01 +01:00
Melanie
f2308c819e
Remove spammy "axislock" debug.
2012-09-17 12:58:59 +02:00
Diva Canto
380962d359
HG2.0: Generalized the allowed HG appearances to be more than 1.
2012-09-16 16:45:57 -07:00
Melanie
a79bafaaaf
Change the close tmeout from 2 to 3 seconds on teleport. This may
...
prevent being logged out after a successful teleport.
2012-09-16 22:52:45 +02:00
Melanie
7d5942d154
Make IncomingCloseChildAgent not send a stop packet. This may prevent
...
a viewer from being logged out after an otherwise successful teleport.
2012-09-16 22:51:04 +02:00
Melanie
a76ce4f64d
Make the agent being kicked a child agent first so there won't be a ghost
2012-09-16 22:50:35 +02:00
Melanie
66bf1376b5
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
2012-09-16 04:21:18 +01:00
Melanie
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
Diva Canto
daa4745fb7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-15 19:35:33 -07:00
Diva Canto
de69a24574
More on HG2.0: added the possibility of controlling the appearance that avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
2012-09-15 19:33:51 -07:00
Robert Adams
b602b476ad
BulletSim: update DLLs and SOs and remove some debugging code.
2012-09-15 15:36:13 -07:00
Robert Adams
c77be802d2
BulletSim: some debugging prints in BSPrim for tracking changes in linkset children.
2012-09-15 15:32:16 -07:00
Robert Adams
1826b2b18e
BulletSim: add the debugging routine DumpRigidBody2() to API2.
2012-09-15 15:32:11 -07:00
Robert Adams
f35bd6eb7d
BulletSim: another attempt at computing physics FPS correctly.
2012-09-15 15:32:05 -07:00
Robert Adams
dcb94b8a24
BulletSim: remove timeStep parameter from calls for vehicle parameter setting. There is no reason these should be using the simulation time interval for parameter calculation.
2012-09-15 15:31:59 -07:00
Robert Adams
6632eb7c05
BulletSim: Remove calculation and passing of unused collied object type.
...
Fix collision code to properly sense mega-region children regions as terrain.
When setting an object physical, reset all the physical properties (friction, ...).
2012-09-15 15:31:54 -07:00
Robert Adams
f0a098924e
BulletSim: set all linkset objects center of mass to the whole linkset's center of mass
2012-09-15 15:31:49 -07:00
Robert Adams
7c347f4c5c
BulletSim: Add calls to linkset class when object going static or dynamic.
...
Reset center of mass on an object when going dynamic.
2012-09-15 15:31:44 -07:00
Robert Adams
d86cbe6379
BulletSim: remove unused NeedsMeshing() code from BSScene.
2012-09-15 15:31:39 -07:00
Robert Adams
c0fec70b1a
BulletSim: Add 'IsNativeShape2' call
2012-09-15 15:31:34 -07:00
Robert Adams
2c5ff93990
BulletSim: Way too many changes in one commit.
...
Many changes to BSDynamic for readability and commentary.
Linkset hacking for vehicles: don't over mass the root prim.
Add parameter for link constraint solver iterations.
Correct uses of timestep in timescale calculations for vehicles.
Reorganize code/logic for making objects static and dynamic for readability
and use of API2.
Changed most calls in BSPrim to use API2 calls (the new way).
Avatars do not generate default Bullet collision events but do call up
to the simulator for every avatar. Reduces overhead.
Objects added to collision list only if they are processing collisions.
Reduces overhead especially for large numbers of avatars.
Generalize call for water height to GetWaterHeightAtXYZ().
Catch and correct exception getting terrain height when out of bounds.
Correct race condition in Terrain Manager where creation wasn't at taint-time.
Add API calls for constructing compound shapes.
Move NeedsMeshing() logic into object class.
Reorganize logic for object meshing to reduce rebuilding of meshs/hulls.
2012-09-15 15:31:29 -07:00
Justin Clark-Casey (justincc)
1ec84ac8b1
Add basic asset connector tests to check behaviour for normal, local and temporary assets.
...
Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load
Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
2012-09-15 02:12:26 +01:00
Justin Clark-Casey (justincc)
d5c8c6bc12
For FlotsamAssetCache, always update access times of cached scene assets before looking for files to expire.
...
This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed.
The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced.
This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
2012-09-15 01:08:15 +01:00
Oren Hurvitz
5dd2569bf7
Added unit tests for multi-region OARs
2012-09-14 20:32:25 +01:00
Justin Clark-Casey (justincc)
d7e6fe488d
Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the multi-OAR patch there is now only one class that handles this operation.
...
Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105
since that did not directly apply
2012-09-14 20:25:44 +01:00
Oren Hurvitz
ce468215d5
Support multi-region OAR files
...
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
2012-09-14 20:25:03 +01:00
Melanie
387e59ff7f
Revamp the HTTP textures handler to allow a maximum of four fetches
...
at any time and to drop requests for avatars n longer in the scene
2012-09-14 21:24:25 +02:00
Melanie
45fe25de0d
Allow some more connections to try to ease lag.
2012-09-14 00:14:39 +02:00
Melanie
f14b257fc0
Wait longer for arrival cofirmation to aid tps into laggy regions
2012-09-14 00:13:08 +02:00
Melanie
e1e9855ede
Wait a bit longer for new scene presences to aid tps into laggy regions
2012-09-14 00:12:41 +02:00
Diva Canto
dd0a89a0e6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-13 10:00:52 -07:00
Diva Canto
190f9c258b
Restarting to work on HGSuitcaseInventoryService: added the ability for the outside world to retrieve appearance items. Not ACLed yet.
2012-09-13 10:00:29 -07:00