7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05:00
f6f6ef1532
Dynamics Integration Part 1
2010-03-11 19:12:38 -05:00
c8c608acc8
Small consistency change
2010-03-07 16:07:40 +00:00
2fdd535302
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-06 12:24:26 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
83929c69e3
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:59:16 +00:00
87590491b5
Fix Physics angular reference frame.
2010-03-04 16:33:26 -05:00
62dd83f473
Remove a superfluous array creation
2010-03-04 10:47:16 +00:00
84b0a23e19
Remove a superfluous array creation
2010-03-04 10:45:46 +00:00
780ee4f991
Fix a few compiler warnings.
2010-03-01 23:04:45 +09:00
a5f78ac604
Formatting cleanup.
2010-03-01 11:59:22 +09:00
93967d4a1c
fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database
...
this meant that the loaded settings would disappear after a restart
2010-02-26 18:30:05 +00:00
393a782858
Fix the crashed session notification from the userserver.
2010-02-25 18:05:30 +01:00
7f61de8f57
Allow particles and texture anims to be persisted to XML. This behaviour is expected.
2010-02-25 14:14:53 +01:00
e99341d7df
llDie() should not work on attachments (results in an incosistent attachment state)
2010-02-25 12:07:56 +01:00
efd4810851
Disable blocking teleports within the same parcel for now; it's not implemented correctly. Will review soon.
2010-02-25 12:04:51 +01:00
e635570cf3
minor formatting tweak - try to trigger a build on panda
2010-02-22 02:13:01 -08:00
03706e3f08
add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive
2010-02-22 01:15:12 -08:00
e6c869ddfc
Minor formatting cleanup.
2010-02-22 13:18:11 +09:00
300f4c58a6
Separate PhysX classes into separate files.
2010-02-22 13:16:40 +09:00
2dea162073
Formatting cleanup.
2010-02-22 12:25:59 +09:00
d1f2fae348
Formatting cleanup.
2010-02-20 11:02:06 +09:00
68b494b2cc
Apply http://opensimulator.org/mantis/view.php?id=4495
...
Adds IsChildAgent property to IAvatar in MRM.
Thanks ziah
2010-02-19 22:44:33 +00:00
8294fbd069
minor: remove mono compiler warning
2010-02-19 22:31:53 +00:00
c767a7901c
forestall bug reports about the Command error: System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is
2010-02-19 22:30:46 +00:00
214b1351fb
minor: Make FlotsamAssetCache default loglevel 0 to match that given in bin/config-include/FlotsamCache.ini.example
2010-02-19 21:18:03 +00:00
842b68eeff
Change handling of the SYSTEMIP constant to be more sane.
...
This will now choose the first network interface IP address, or the loopback
interface if no external interfaces are found. It will log the IP address
used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
2010-02-18 04:19:33 +00:00
92f8f3e9d2
Revert "change "SYSTEMIP" to "localhost" in the create region console command prompt" after speaking to Dahlia
...
This reverts commit c62a6adb2b
2010-02-18 03:31:06 +00:00
c62a6adb2b
change "SYSTEMIP" to "localhost" in the create region console command prompt
2010-02-17 19:56:30 -08:00
10f94a3c33
remove old commented out switch statement in LLClientView since this has successfully been split into separate methods for quite some time now
2010-02-17 21:13:31 +00:00
95a31c9b6f
minor: fix error inserting field in log message
2010-02-17 20:57:29 +00:00
92a8d7ce6c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-16 23:15:59 +00:00
d6eff8ebcf
Change a condition to actually make linden land reclaim work
2010-02-16 23:14:57 +00:00
4355bcc417
Disable Data.BasicRegioNTest.T016_RandomSogWithSceneParts() temporarily since it's making the tests fail but the cause is not obvious (wrapped up in layers of reflection)
2010-02-16 19:31:49 +00:00
4c90ee2943
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-16 19:08:06 +00:00
052f2b3e27
minor: Make SOG.DelinkFromGroup() return the newly delinked scene object instead of void
2010-02-16 14:36:08 +00:00
af2d20c5fa
Fix an inconsistency in llSetPayPrice between SL and OS behaviour
2010-02-15 22:22:36 +01:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
47a9e48f46
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-02-15 06:15:14 +01:00
94c417c90c
Implement missing llGetPrimitiveParams parameters
2010-02-15 06:10:04 +01:00
5c7acd0d4d
Fixes a bug in the previous patch.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-15 01:07:02 +00:00
ce3e265575
Plug a small hole
2010-02-15 00:06:03 +00:00
2c0c21d0a5
Plug a small hole
2010-02-14 23:58:54 +00:00
b2fefe3e3f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-14 22:27:59 +00:00
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +00:00
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
45493171b0
* SQLite match code casing with regionsettings table field casing (what's with the upper case S in Sandbox while the rest is lower case 0.o)
...
* It's doubtful that this will have any effect on mantis http://opensimulator.org/mantis/view.php?id=4577 . Sqlite 3 is required, Sqlite 2 was reported.
2010-02-13 05:50:57 -05:00
fa6da2f6c6
* This is an attempt to resolve mantis 4437 by using SqliteAdapter type statements instead of blanket SQL statements. The hope is that this makes SQLite work on Linux/Mono again. Re: http://opensimulator.org/mantis/view.php?id=4437
...
* Added a 'Create Update Statement' method that takes two fields for a primary key
* Added an Update and Delete command for parcels and land access list table rows.
2010-02-13 05:09:15 -05:00
b2656e62ba
minor: update CONTRIBUTORS.txt
2010-02-12 23:16:45 +00:00
00800c59d3
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
...
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
Kitto Flora