Commit Graph

23505 Commits (640d2b0d5d82166cf4332b9db21ec814049c6334)

Author SHA1 Message Date
Melanie 62c277ff9f Add a result param to te money module interface 2013-06-13 02:52:11 +02:00
Melanie 689969e143 * This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
Conflicts:

	OpenSim/Data/SQLite/SQLiteSimulationData.cs
2013-06-13 02:50:39 +01:00
Melanie a4a4898a0e Put the "script saved" and "notecard saved" messages back into the bottom
right corner.
2013-06-11 20:39:09 +02:00
Melanie 745a209bf2 Explicitly set uploaded mesh object perms 2013-06-10 01:16:22 +02:00
UbitUmarov 925a8d47eb Merge branch 'avination-current' into ubitwork 2013-06-08 19:19:51 +01:00
UbitUmarov 244f6fa5cd Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2013-06-08 19:18:47 +01:00
Melanie 8582b2b992 Make objects attached from the ground appear in inventory again. Fixes a number
of interaction issues causing client crashes.
2013-06-08 02:32:05 +02:00
UbitUmarov ed7fe6239c add indexes for new visual parameters shape_hover and
APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for
now
2013-06-07 23:18:48 +01:00
Melanie 17a902fed4 Clean up poll service 2013-06-07 22:39:27 +02:00
UbitUmarov c173c2eed5 try to suspend and resume keyframes on copy to inventory to take copy
doesn't destroy state
2013-06-06 19:21:21 +01:00
UbitUmarov 8bfd5c8927 Merge branch 'avination-current' into ubitwork 2013-06-06 19:03:32 +01:00
UbitUmarov 18e4496d2d keyframe: add more locks, change timming stop, added Suspend and resume 2013-06-06 18:57:32 +01:00
UbitUmarov c5d967b946 Merge branch 'avination-current' into ubitwork 2013-06-06 00:37:06 +01:00
Melanie 02548bdc16 Update HTTP server 2013-06-04 21:11:16 +01:00
Melanie 57c8d82c9e Fix llTeleportAgentGlobalCoords 2013-06-02 23:53:20 +02:00
Melanie e2d4cb870e Unsit seated avatars when an object is deleted 2013-06-02 23:53:07 +02:00
Melanie bd87eb90d1 Implement PERMISSION_TELEPORT and the needed checks to make it work.
Old auth system still works as well.
2013-06-02 16:28:28 +02:00
UbitUmarov 8fe2308afc Merge branch 'avination-current' into ubitwork 2013-05-31 23:18:12 +01:00
Melanie 9589a09eda Fix multi-wear of alpha and tattoo layers. 2013-05-31 22:02:31 +02:00
Melanie 70d5c29310 Stop sending velocity to avoid snap-back 2013-05-31 21:55:56 +02:00
UbitUmarov 4709436a6c retouch prim stopped condition test 2013-05-29 20:23:52 +01:00
UbitUmarov a6b964aa11 removed spurius ref to ode.dll from odeapi 2013-05-29 19:51:45 +01:00
UbitUmarov d5b1baffec correction to previus comment: all parameters but gravity modifier have
efect on all prims.
2013-05-29 06:45:25 +01:00
UbitUmarov 269febc87e let gravity modifier, friction, restitution and density changes be applied
to prim. Only have efect on root prim. Density doesn't get effect
imediatly, only on next change of size or shape. density change
implies a full body rebuild to be done later, after reducing the  number
of sets sop does. Other parameters should work. **** mainly untested ***
2013-05-29 06:32:26 +01:00
UbitUmarov 1cf24b7092 make sure friction slip parameters are zero ( or other value ) and not
default cmf
2013-05-29 04:47:59 +01:00
UbitUmarov 0882846770 missing file 2013-05-29 02:21:02 +01:00
UbitUmarov f00ecf5fe7 missing files 2013-05-29 02:18:05 +01:00
UbitUmarov 4e72cf9ee2 *** DANGER TESTING **** changed prims mesh generation hopefully removing
spurius faces. CHanged several aspects. Fixed prims inertia that was too
low, still using box as model. Increased number of quickstep SOR
iterations to 15. Keep it 15 even on heavy load ( will only jump
simulation time).
2013-05-29 02:08:14 +01:00
Melanie a348c8e44a Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects. 2013-05-26 14:11:48 +02:00
Melanie 0086c3b5fb Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
This will require all money modules to be refactored!
2013-05-25 01:58:50 +02:00
Melanie 027580935a Reset "Show in search" on parcels cut off other parcels that are in search 2013-05-24 01:09:07 +02:00
Melanie 9ba35c6b7e Port fix from justicc - decouple pay prices on drag-copied prims 2013-05-24 00:45:30 +02:00
Melanie 4cb7ee47f2 Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in.... 2013-05-22 23:49:34 +02:00
teravus 477a5e3a35 * This fixes the avatar stuck in objects on login and teleport by gently applying an upward motion when stuck in things on the Z
* Comments describe how it filters out good, normal collisions, from 'stuck' collisions..   It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances.
2013-05-14 20:55:56 -04:00
teravus 799ba5aa7b * Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. This fits within Ubit's framework of multi-body collisions, just moves the reactive force to the Midboxgeom(actual detection) instead of the bigbox geom(pre detection) 2013-05-14 19:17:31 -04:00
Melanie f9daf921f7 Explicitly zero avatar velocity on sit 2013-05-13 03:29:11 +02:00
Melanie 296b43f597 Small adjustments to the floater module 2013-05-13 02:15:48 +02:00
Melanie 3f6071ce3a Guard against trying to access terrain heights out of bounds. Clamp to sim. 2013-05-11 16:16:02 +02:00
Melanie 8ade6fa617 Refactor to get closer to core 2013-05-11 16:15:39 +02:00
Melanie cbae04ba97 Remove dumb "Region found!" message from map search 2013-05-06 06:15:47 +02:00
Melanie a8faed6f76 Implement llSetContentType using the new OpenID auth support for authentication 2013-05-05 22:01:07 +02:00
Melanie 2332453974 Add RegionManager level and the ability to use literal XML to the dynamic floater module 2013-05-04 00:45:27 +02:00
Melanie 4904d40138 Add llGetPhysicsMaterial 2013-05-04 00:44:47 +02:00
Melanie d982d24938 Fix the long standing bug of items being delivered to lost and found or trash when takig copy.
This bug was recently aggravated through the perms changes required for the
export permission.
2013-05-01 21:42:51 +01:00
Melanie 958a500692 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2013-04-30 23:40:06 +02:00
Melanie 0af1d8fe19 Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:35:59 +02:00
Justin Clark-Casey (justincc) 5a4cb539d2 Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-30 01:25:21 +01:00
Melanie 14f78c2e66 Merge branch 'ubitwork' into avination-current 2013-04-28 19:04:01 +02:00
ubit 61ea7ee5a9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
	bin/Regions/Regions.ini.example
2013-04-28 20:40:11 +02:00
ubit 7000b52aeb Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-04-28 19:46:57 +02:00