Diva Canto
de91a9e09b
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-02-22 09:56:33 -08:00
Diva Canto
0d85f4f861
Deleted duplicate [GridService] section.
2010-02-22 09:56:03 -08:00
dahlia
e635570cf3
minor formatting tweak - try to trigger a build on panda
2010-02-22 02:13:01 -08:00
dahlia
03706e3f08
add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive
2010-02-22 01:15:12 -08:00
Jeff Ames
e6c869ddfc
Minor formatting cleanup.
2010-02-22 13:18:11 +09:00
Jeff Ames
300f4c58a6
Separate PhysX classes into separate files.
2010-02-22 13:16:40 +09:00
Jeff Ames
2dea162073
Formatting cleanup.
2010-02-22 12:25:59 +09:00
Diva Canto
2e7aa387f7
One more test running.
2010-02-21 19:11:48 -08:00
Melanie
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
Diva Canto
70de6956ff
Small bug fixes for making tests work.
2010-02-21 18:56:44 -08:00
Diva Canto
b92645ac56
MySQL tests pass, except T016_RandomSogWithSceneParts. Total mystery as to why that test doesn't show in panda.
2010-02-21 17:59:00 -08:00
Diva Canto
bb171717ce
Deleted obsolete files in the Data layer. Compiles.
2010-02-21 15:38:52 -08:00
Diva Canto
bd5a4dab0c
Bug fixes on field names in order to make data import work from old users table to new UserAccounts table.
2010-02-21 09:39:12 -08:00
Diva Canto
552e9e8c78
* Added SQlite connector for AvatarData. Tested -- works.
...
* Small bug fix in debug message
* Set default standalone configs to use SQLite across the board
2010-02-21 09:09:35 -08:00
Diva Canto
8a4947f8c7
SQLite connector for UserAccounts and Auth works. Yey!
2010-02-21 08:47:24 -08:00
Diva Canto
56fb7821ad
Restored mising m_Connection.
2010-02-20 21:24:18 -08:00
Melanie
d761d1624b
Fix SQLite locking and make it more fascist for now
2010-02-21 04:20:22 +00:00
Diva Canto
611eeb583c
Reverted SQLite/SQLiteGenericTableHandler to what it was + singleton.
2010-02-20 20:59:04 -08:00
Diva Canto
df59d098b3
SQLite connector better, but access to tables still doesn't work.
2010-02-20 20:13:38 -08:00
Diva Canto
0ab6aac052
Added UserAccountData and auth to the SQLite connector. Compiles, runs, but access to these tables doesn't work.
2010-02-20 17:52:38 -08:00
John Hurliman
845a390e93
* Added a sanity check for missing asset data in LLClientView
...
* Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil
* Linked content type to asset type in AssetMetadata
2010-02-20 16:21:13 -08:00
Jeff Ames
d1f2fae348
Formatting cleanup.
2010-02-20 11:02:06 +09:00
John Hurliman
eb22fde96c
* Fixed SL asset type enum to mime type conversion and added more helper functions for going back and forth between enums and mime types
2010-02-19 15:28:35 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
8294fbd069
minor: remove mono compiler warning
2010-02-19 22:31:53 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
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
Melanie
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
dahlia
c62a6adb2b
change "SYSTEMIP" to "localhost" in the create region console command prompt
2010-02-17 19:56:30 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
95a31c9b6f
minor: fix error inserting field in log message
2010-02-17 20:57:29 +00:00
Melanie
92a8d7ce6c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-16 23:15:59 +00:00
Melanie
d6eff8ebcf
Change a condition to actually make linden land reclaim work
2010-02-16 23:14:57 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
4c90ee2943
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-16 19:08:06 +00:00
Justin Clark-Casey (justincc)
052f2b3e27
minor: Make SOG.DelinkFromGroup() return the newly delinked scene object instead of void
2010-02-16 14:36:08 +00:00
CasperW
af2d20c5fa
Fix an inconsistency in llSetPayPrice between SL and OS behaviour
2010-02-15 22:22:36 +01:00
Jeff Ames
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
CasperW
47a9e48f46
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-02-15 06:15:14 +01:00
CasperW
94c417c90c
Implement missing llGetPrimitiveParams parameters
2010-02-15 06:10:04 +01:00
Revolution
5c7acd0d4d
Fixes a bug in the previous patch.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-15 01:07:02 +00:00
Melanie
c033223c63
Merge branch 'master' into presence-refactor
2010-02-15 00:20:48 +00:00
Diva Canto
d326a1df3f
Extraneous debug messages removed
2010-02-14 17:01:22 -08:00
Diva Canto
dc19785672
Added UserAccount, Avatar and Authentication to Data.Null, so that OpenSim can run out-of-the-box. #WaitingForSQLite
2010-02-14 16:57:02 -08:00
Melanie
ce3e265575
Plug a small hole
2010-02-15 00:06:03 +00:00
Melanie
2c0c21d0a5
Plug a small hole
2010-02-14 23:58:54 +00:00
Melanie
b2fefe3e3f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-14 22:27:59 +00:00
Melanie
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +00:00
Revolution
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