Justin Clark-Casey (justincc)
21393af631
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-13 20:48:50 +00:00
Justin Clark-Casey (justincc)
189c67db95
On object deserialization, go back to logging errors at DEBUG level rather than ERROR. Restore extra log message if shape processing fails.
...
Logging level was DEBUG before 312e145
(Fri Feb 3 2012).
312e145
also accidentally removed the 'general error' log message if any shape deserialization failed.
This commit restores it, though this has no functional impact.
2012-02-13 20:43:26 +00:00
UbitUmarov
6fd6919a0b
remove drawstuff from ubitode
2012-02-11 19:25:41 +00:00
UbitUmarov
f168fefb79
removed outdated coments.
2012-02-11 19:14:27 +00:00
UbitUmarov
bcf59a574f
remove forgotten taints code
2012-02-11 19:12:04 +00:00
UbitUmarov
09f6647aa3
scenepresence change! in standup() give avatar a physical actor after deciding the new position. This reduces a bit the odds of it being still coliding with object.
2012-02-11 17:48:49 +00:00
UbitUmarov
022ae33ed5
UbitODE: replace 'taints' by 'changes' for avatars also. This provides better time order with changes in prims.
2012-02-11 17:35:38 +00:00
UbitUmarov
d4e28ed113
vehicle changes done by simulation thread and not calling one
2012-02-11 15:18:13 +00:00
UbitUmarov
3f9c390b4d
changes to vehicle banking
2012-02-11 14:29:36 +00:00
UbitUmarov
33a9f0f1c5
a bit better vertical attractor and banking
2012-02-11 04:42:45 +00:00
UbitUmarov
f415256e0b
Use mesh to estimate real center of prims if avaiable. Let sculpt map textures with alpha channel work. On linux J2DecodeCache folder must be deleted to remove bad entries. Corrently this can't be cached on linux (mono/ cairo/? problem)
2012-02-11 03:25:17 +00:00
UbitUmarov
b617411b97
scale avatar push force with avatar density
2012-02-11 02:48:38 +00:00
Justin Clark-Casey (justincc)
b92b9228ef
correct the default avatar_terminal_velocity value that I accidentally left in whilst testing
2012-02-11 02:29:07 +00:00
Justin Clark-Casey (justincc)
f49897a419
Clamp ODE character velocity. Make ODE falling character 54m/s by default.
...
If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value.
In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver.
This also appears to be the value used on the linden lab grid.
This should resolve http://opensimulator.org/mantis/view.php?id=5882
2012-02-11 02:28:40 +00:00
UbitUmarov
83868c0387
revert project name to OpenSim and not Careminster
2012-02-11 01:07:57 +00:00
Justin Clark-Casey (justincc)
aab30f5e67
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-11 00:11:28 +00:00
Justin Clark-Casey (justincc)
e7fd732209
Make ScenePresence.MovementFlag a private only settable value to reduce complexity of code analysis
2012-02-11 00:10:59 +00:00
Melanie
acfe7e555e
Merge branch 'master' into careminster
2012-02-10 23:59:10 +00:00
Melanie
5023cc86f0
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:58:39 +00:00
Melanie
4455140f30
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:52:06 +00:00
UbitUmarov
43a74d8481
test on git
2012-02-10 23:51:55 +00:00
Justin Clark-Casey (justincc)
71e484516a
minor: Remove warning from RegionInfo due to repeated config.GetString() call where the first was unused.
2012-02-10 23:41:14 +00:00
Justin Clark-Casey (justincc)
38f878952c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-10 23:39:59 +00:00
Justin Clark-Casey (justincc)
d80422eba7
Add line numbers to Util.PrintCallStack()
2012-02-10 23:39:32 +00:00
UbitUmarov
e3f5fd81f1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
prebuild.xml
2012-02-10 23:03:30 +00:00
UbitUmarov
7cf73cb92a
Changes to vehicles code etc. Includes some debug aids to remove later.
2012-02-10 22:43:51 +00:00
BlueWall
ee078f717a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-10 16:28:11 -05:00
BlueWall
73f34de1f9
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-02-10 16:27:14 -05:00
Justin Clark-Casey (justincc)
b3d152f3ba
Fix an npc delete race condition with LSL sensors where an initial presence check could succeed but then the npc removed before the subequent npc check.
...
The resulting null would cause an exception. We now check for null before looking at SenseAsAgent.
Hopefully fixes http://opensimulator.org/mantis/view.php?id=5872
2012-02-10 21:26:05 +00:00
PixelTomsen
a7dc7e636e
Fix: Covenant view fails after updates or cache-clean see mantis http://opensimulator.org/mantis/view.php?id=2879
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-10 15:45:03 -05:00
Justin Clark-Casey (justincc)
44d84bc277
Fix bug where somebody taking a copy of an object they didn't own that was rezzed before the region was restarted would wrongly place the copy in the object owner's inventory.
...
Addresses http://opensimulator.org/mantis/view.php?id=5825
2012-02-10 19:58:34 +00:00
Melanie
215acbcc96
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-02-10 10:20:51 +00:00
PixelTomsen
7273e05995
Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.org/mantis/view.php?id=3731
2012-02-10 02:30:55 +00:00
Justin Clark-Casey (justincc)
ddca5347c3
When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer permissions, not PermissionMask.All
...
Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set.
This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is).
Should resolve http://opensimulator.org/mantis/view.php?id=5651
2012-02-10 02:13:15 +00:00
Justin Clark-Casey (justincc)
e8cc1bd329
Fix another Torture test build break on Windows.
2012-02-09 20:12:29 +00:00
Justin Clark-Casey (justincc)
9c84a8162f
If NPCModule.CreateNPC() fails to create the required ScenePresence (which should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
2012-02-09 01:17:59 +00:00
Justin Clark-Casey (justincc)
16c4636048
Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.
2012-02-09 00:38:09 +00:00
Melanie
7c888f6af1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-02-09 00:19:37 +00:00
Justin Clark-Casey (justincc)
dbe32a1f6d
minor: put in commented out logging statements for future reuse
2012-02-09 00:10:45 +00:00
UbitUmarov
6af01f6767
initial introdution of physics actor building control.
2012-02-08 23:14:53 +00:00
Justin Clark-Casey (justincc)
3fa61c4a39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-08 22:21:15 +00:00
Justin Clark-Casey (justincc)
dfa19e23f0
Stop a scene object from attempting to link with itself (which results in an exception and constant complaints in v3 viewers).
...
Aims to address http://opensimulator.org/mantis/view.php?id=5878
2012-02-08 22:19:34 +00:00
UbitUmarov
6cc9aa30ac
first change in SOP. in AddPrimShape(..) give physics the world rotation and not local offset. Currently physics interface only knows about world frame
2012-02-08 15:45:44 +00:00
UbitUmarov
754129b903
files need to run UbitODE in linux ( untested )
2012-02-08 15:33:51 +00:00
UbitUmarov
12c3239666
changes needed to compile UbitODE, also changes project name to "Careminter". untested on linux
2012-02-08 15:29:48 +00:00
UbitUmarov
c75fa8b8a1
changes in physics manager, needed for UbitODE
2012-02-08 15:28:13 +00:00
UbitUmarov
815f3af1d7
UbitODE plugin initial commit
2012-02-08 15:24:10 +00:00
Melanie
9c6ba8d18f
Push more NPC stuff into threads
2012-02-08 13:04:23 +01:00
Robert Adams
d5c08c44bf
Add missing reference to prebuild.xml for torture tests
2012-02-07 16:40:09 -08:00
Justin Clark-Casey (justincc)
bef2a368f4
Make WebStats logging report consistently as WEB STATS MODULE instead of VC, VS and WEBSTATS
2012-02-07 23:38:53 +00:00