e6a050f79e
Merge branch 'master' of /var/git/opensim/
2010-10-30 12:40:03 -07:00
48f6d47744
Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight.
2010-10-30 12:30:03 -07:00
0ae4774ce5
Merge branch 'master' of /var/git/opensim/
2010-10-30 12:10:13 -07:00
623cee1ffc
Move physics actor creation to after SetHeight to try and prevent
...
bowlegginess. Didn't work but is better this way anyway.
2010-10-30 19:17:52 +01:00
96a29c43b0
Merge branch 'master' into mantis5110
2010-10-30 14:11:02 -04:00
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
e98d8d500f
Fix logins and avatar appearance. Contains a Migration. May contain nuts.
...
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00
574bc590a2
Merge branch 'master' of /var/git/opensim/
2010-10-29 23:30:05 -07:00
09bf9d5fca
* AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer.
2010-10-30 02:26:48 -04:00
6d52c42de2
Merge branch 'master' of /var/git/opensim/
2010-10-29 23:10:04 -07:00
37e6de5ace
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-30 02:07:27 -04:00
4a24bf74d9
* Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue.
...
* This is libOMV SVN revision 3463.
2010-10-30 02:06:43 -04:00
9e7d3e0f25
Merge branch 'master' into mantis5110
2010-10-29 23:59:16 -04:00
c8d65c359f
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
594f23ff22
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Services/GridService/HypergridLinker.cs
2010-10-29 23:46:53 -04:00
e6f7d312dd
Merge branch 'master' of /var/git/opensim/
2010-10-29 20:30:07 -07:00
d219317074
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
e6a7b66b08
Merge branch 'master' of /var/git/opensim/
2010-10-29 19:50:06 -07:00
d0895a4a3a
On first login, Ruth is back now. Strangely, inventory items are created for
...
tattoo and alpha layers. Any change of appearance in the sim makes the green
gnome reappear on next login. Progress of sorts.
2010-10-30 03:28:59 +01:00
dcd5cf6bde
Merge branch 'master' of /var/git/opensim/
2010-10-29 19:20:06 -07:00
9beefc4ea9
Merge branch 'master' of /var/git/opensim/
2010-10-29 19:10:04 -07:00
f9227977f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-30 03:07:45 +01:00
45220a6954
minor: remove some old commented out code
2010-10-30 03:01:40 +01:00
63bdfb1e28
Clarify comment for configuration option Check4096 and show the default value.
2010-10-30 03:01:27 +01:00
adef6b04cb
Logins work now, but avatars are green ugly gnomes.
2010-10-30 02:52:59 +01:00
ba6f651b06
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 02:26:18 +01:00
ff7da2082d
This commit fixes all the appearance related null refs. Still can't log in,
...
client displays a blank error box.
2010-10-30 02:25:25 +01:00
f8471de004
Merge branch 'master' of /var/git/opensim/
2010-10-29 17:50:04 -07:00
7df180c18e
Merge branch 'master' of /var/git/opensim/
2010-10-29 17:40:03 -07:00
343c894658
Set async_packet_handling = true by default
...
Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously.
Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably.
Of course, a lot of login lag is still coming from other sources.
2010-10-30 01:35:12 +01:00
ade71c9ed7
Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info
2010-10-30 01:32:56 +01:00
46362cd1c0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:58 +01:00
7503c4ad61
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:42 +01:00
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
ae12bcc43c
Merge branch 'master' of /var/git/opensim/
2010-10-29 16:00:05 -07:00
09705514ff
tweak a few more scene presence logging messages for consistency
2010-10-29 23:52:25 +01:00
f6b88d6208
Merge branch 'master' of /var/git/opensim/
2010-10-29 15:50:06 -07:00
e66ec432af
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
2010-10-29 23:45:10 +01:00
45c6ce65f5
Merge branch 'master' of /var/git/opensim/
2010-10-29 15:20:04 -07:00
abcde41c0d
Merge branch 'justincc-dev'
2010-10-29 23:15:35 +01:00
25e19ba7e9
add timing report to CompleteScenePresence for diagnostic purposes
2010-10-29 23:03:11 +01:00
4a56ea8d88
Merge branch 'master' of /var/git/opensim/
2010-10-29 14:10:10 -07:00
8d002c4553
Merge branch 'master' of /var/git/opensim/
2010-10-29 14:00:07 -07:00
bcd784b316
for now, comment out some older or redundant log debug lines to make diagnostics easier
2010-10-29 21:49:26 +01:00
8acf8eb481
Merge branch 'master' of /var/git/opensim/
2010-10-29 13:40:07 -07:00
f19816aeb9
Add number of ms it takes to complete UseCircuitCode packet handling to log for diagnostics
2010-10-29 21:38:26 +01:00
8d8a795b28
Merge branch 'master' of /var/git/opensim/
2010-10-29 13:20:04 -07:00
4f39329d6f
Rename the new default texture to be consistent with the others
2010-10-29 21:10:19 +01:00
32e5bee3a7
Add a default alpha layer
2010-10-29 21:09:31 +01:00
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
opensim mirror account