4675a2fb29
Merge branch 'justincc-master'
2014-01-14 01:19:54 +00:00
797684115c
minor: Add David Rowe to ctrlaltdavid handle by request
2014-01-14 01:16:04 +00:00
239b85d7ce
Fix crash in BulletSim which sometimes happens making a linkset physical
...
(like sitting on and activating a vehicle) and crossing borders.
This keeps better bookkeeping on compound shapes so BulletSim can
identify them when being freed.
2014-01-10 22:52:31 -08:00
b5ef585069
Merge branch 'justincc-master'
2014-01-11 01:22:42 +00:00
bc0ff5e7d4
Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.
2014-01-11 00:54:41 +00:00
66e2e1c9c3
Merge branch 'justincc-master'
2014-01-10 20:52:50 +00:00
70dd4cf152
In library inventory, correct asset id for llSay example script
...
From http://opensimulator.org/mantis/view.php?id=6917
Thanks to FreakyTech for this spot.
2014-01-10 20:51:28 +00:00
09e800f4b1
Merge branch 'justincc-master'
2014-01-10 20:46:00 +00:00
8c6b9ef865
minor: Add ctrlaltdavid to contributors list
2014-01-10 20:45:05 +00:00
08f2fc63cd
Fixed llTextBox error message text
2014-01-10 20:43:24 +00:00
68cbccb288
Merge branch 'justincc-master'
2014-01-10 20:37:14 +00:00
9050c152b4
Dynamically adjust to the number of visual params sent.
2014-01-10 20:31:52 +00:00
da47bcae3e
When moving the root prim of an attachment: a) Change the attach position; b) Move the other prims in the reverse direction to compensate
2014-01-10 20:24:11 +00:00
5e72de1908
Merge branch 'justincc-master'
2014-01-10 20:19:38 +00:00
88f01a4130
When creating a coalesced object, set its permissions to the lowest-common-denominator of all the sub-objects
2014-01-10 20:01:08 +00:00
a94e1e0e08
When creating a coalesced object, set its Creator ID if all the objects have the same creator
2014-01-10 19:54:17 +00:00
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
13f31fdf85
Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory.
...
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
2014-01-10 19:37:59 +00:00
32e9c16957
Merge branch 'justincc-master'
2014-01-08 01:04:26 +00:00
0155d42b80
If an agent is sitting, then do send the rotation in the agent update instead of zeroing it to resolve mouselook camera problems
...
Addresses http://opensimulator.org/mantis/view.php?id=6892
Thanks to tglion for this spot.
This resolves a recent regression from 17b32b764a
2014-01-08 00:54:39 +00:00
1eecb34e62
Remove the core module extra profile settings support carried in with the latest
...
patches. We don't need it.
2014-01-05 21:16:30 +00:00
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
8d3f242cce
Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminster
2014-01-05 20:05:05 +00:00
88b4387abf
Merge commit '5b73b9c4a85335ba837280688b903fef44be8f35' into careminster
2014-01-05 20:04:56 +00:00
b7540be24f
Merge commit '3df8990e6ff6a5293b425e906cd381da9e0424a5' into careminster
2014-01-05 20:04:37 +00:00
c1b44e1721
Merge commit '97934e00e667b6f432340a54671221a970a048d7' into careminster
2014-01-05 20:04:04 +00:00
31279a3308
Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminster
2014-01-05 20:03:48 +00:00
38148bd4b6
Some missing definitions needed for successful compilation.
2014-01-04 19:01:05 -08:00
8ff2ff1a36
Remove some chatty DebugFormat statements. No functional changes.
2014-01-04 19:01:04 -08:00
7e32313a49
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
2014-01-04 19:01:04 -08:00
004ecee314
varregion: send region size in LLLoginResponse.
2014-01-04 19:01:03 -08:00
d9848943a9
Add routines in Util.cs for conversion of region handles to region
...
locations and for the conversion of region world location to region
'region' location. These routines will replace all the arithmatic
scattered throughout OpenSimulator.
2014-01-04 19:01:03 -08:00
dd96fef940
Dynamically adjust to the number of visual params sent.
2014-01-04 21:18:37 +00:00
eab9390e05
Initialize default region size in GridRegion in the no parameter constructor
...
as is used by the grid connector tests.
2013-12-28 07:20:14 -08:00
6869633d76
Add serialization/deserialization of region size to RegionInfo, GridRegion, and RegionData.
...
This does not modify interfaces or handling of variable sized regions. This only
enables the loading and storing of the region size and the reporting of the
region size in grid service responses.
The database tables already have the code to load and store the region size.
2013-12-28 06:58:15 -08:00
540fa84842
Merge branch 'justincc-master'
2013-12-21 01:12:45 +00:00
2f94165dcc
Add lsl arg syntax checking for control event
2013-12-21 01:00:50 +00:00
f1cd813a29
refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for consistency
2013-12-21 00:49:01 +00:00
871ac5b16c
Add arg checking for at_target lsl event
2013-12-21 00:46:34 +00:00
a5e4780547
Add lsl event arg checking for at_rot_target
2013-12-21 00:37:56 +00:00
b757ab2586
Add lsl event argument checking for attach and on_rez
2013-12-21 00:08:36 +00:00
68773ee7c4
Merge branch 'justincc-master'
2013-12-19 01:41:04 +00:00
e298bf41ff
Add missing viewer param elements for butt and breast physics.
...
Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces
Thanks cinderblocks!
2013-12-19 01:24:36 +00:00
a5ca15c428
Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending
2013-12-18 23:35:38 +00:00
141d771a93
Fix issue with editing notes for other avatars
2013-12-16 17:36:21 -05:00
b03ec6137f
Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user.
2013-12-16 17:36:04 -05:00
fe01e7d1cc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-16 22:11:03 +00:00
f69e91dc2d
This is the acutal sitting avatar crossing code. This commit implements the
...
actual crossing mechanics for seated avatars, using the supporting code from
the previous commits. Physics is not supported yet, although some few bits
for them are already in place due to the earlier code drops. With this commit,
crossing sitting avatar by "editing" the prim across the border, by using
llSetPos or keyframe motion may already be possible. Vehicles will come next.
2013-12-16 22:08:02 +00:00
00e632ec3a
Merge branch 'justincc-master'
2013-12-14 02:49:23 +00:00
51da52f904
Extend TestLlGetNotecardLine() regression test to contain chars that are two bytes in utf8
2013-12-14 02:48:29 +00:00
Justin Clark-Casey (justincc)