4b46b7a5ad
Fixed line endings from previous commit
2011-10-06 23:20:51 -07:00
f26a966b8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-06 22:50:03 -07:00
4748c19bdb
Refactored "known child region" in ScenePresence. There were 4 different
...
ways to access the list/dictionary of child regions and locking was
inconsistent. There are now public properties which enforce locks.
Callers are no longer required to create new copies of lists.
2011-10-06 22:47:33 -07:00
1f78dc6504
remove the pointless slashes on the end of the (5!) different server stat retrieval mechanisms.
...
Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/
Can't do this with webstats yet since it does insane things to the path.
2011-10-07 00:30:35 +01:00
4c812884be
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-06 23:47:41 +01:00
95910f03d4
WebStats - Home Link Fix
...
http://opensimulator.org/mantis/view.php?id=4536
2011-10-06 22:30:24 +01:00
9a16e76f51
Simplified IsInTransit property on ScenePresence and removed InTransit() which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().
2011-10-06 12:39:19 -07:00
08f264d096
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-06 12:22:15 -07:00
bd9ba904c3
Refactor ScenePresence so gets and sets are through properties. Added private sets when needed. Removed redundant code when methods replicated what the set already does
2011-10-06 12:19:31 -07:00
9500415c61
Merge branch 'careminster-presence-refactor' into bigmerge
2011-10-06 17:57:28 +02:00
300d357573
Fix physics proxy position when linking and rotating the root prim only
2011-10-06 17:55:20 +02:00
363a99593d
Change the asset connector to allow connection to different asset servers
...
depending on the first two digits of the asset id.
2011-10-06 15:39:21 +02:00
77b8fb0f86
Added back UserAccount that creates random UUID for new account.
...
This should fix recent issues with 3rd party apps that use the
old interface w/o breaking the new one.
2011-10-05 22:01:12 -04:00
ca83f99332
Instead of adding stat agentMS in all kinds of places, calculate it instead in the main Scene.Update() loop, like the other stats
...
Some of the places where agentMS was added were in separate threads launched by the update loop. I don't believe this is correct, since such threads are no longer contributing to frame time.
Some of the places were also driven by client input rather than the scene loop. I don't believe it's appropriate to add this kind of stuff to scene loop stats.
These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time
2011-10-06 00:45:25 +01:00
7fa1c979cf
rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not a single one
2011-10-05 23:36:27 +01:00
8a8983b3d4
Add user ID to new estate user prompt, to make it clearer and consistent with the main create user prompts
2011-10-05 23:34:18 +01:00
604708fc96
Change WebStatsModule to check its config properly, instead of catching the ineviable NullReferenceException!
...
Also, tidy up spacing.
2011-10-05 23:31:53 +01:00
9090039324
Remove unused local variable i from OdeScene.Simulate()
2011-10-05 22:15:28 +01:00
7d033187d8
Make reported sim fps more accurate, in line with frame time ms
...
Also remove some unused fields and improve naming on others.
2011-10-05 22:08:56 +01:00
3142982353
Removed redundant scene presence lookups in HGMessageTransferModule
2011-10-05 12:58:24 -07:00
38d205502a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 16:59:35 -07:00
146322eb34
Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree objects already triggers objectkill packet to client. No need to send again.
2011-10-04 16:59:05 -07:00
9a49b3b519
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 23:53:30 +01:00
b907a66f39
When creating a new user on the comand line, give the option of allowing a UUID to be specified to override the randomly generated one.
...
This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
2011-10-04 23:48:35 +01:00
413e299045
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 15:44:22 -07:00
b229a72a5f
Turn off keepalives when commands are specified
2011-10-04 15:43:41 -07:00
8a216dc1cc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 22:49:06 +01:00
f1986d54bb
Clarify explanation of DeleteScriptsOnStartup switch in [XEngine].
2011-10-04 22:48:28 +01:00
92c88121c7
Removed all refs to IClientAPI from IAttachmentsModule. Separated client handlers for attachments to call public interface and rearranged module file into sections
2011-10-04 14:40:39 -07:00
bfa405e6f7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-03 16:45:04 -07:00
460946ad62
Removed redundant code in AttachmentsModule and simplified interfaces which converted back and forth between ScenePresence and IClientAPI. More to be done still.
2011-10-03 16:44:32 -07:00
c7d0d71666
trival tweak to trigger the continuous integration system
2011-10-04 00:37:02 +01:00
b98442dcec
Animation-States Turning Left, Turning Right implemented/enabled
...
http://opensimulator.org/mantis/view.php?id=3036
2011-10-04 00:27:11 +01:00
a8af0a5ba8
Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather than ""
...
As per http://wiki.secondlife.com/wiki/LlGetTexture
2011-10-04 00:15:48 +01:00
8a6e6866d9
For llGetTexture(), if the face texture asset is in the inventory, return the inventory name rather than the asset UUID
...
This is as per http://wiki.secondlife.com/wiki/LlGetTexture
Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early.
Thanks Michelle Argus!
2011-10-04 00:07:52 +01:00
34026887fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-03 23:26:52 +01:00
37ae6451f9
Remove vestigal RegionStatus.SlaveScene.
...
This appears to be code clutter since the code that uses this has long gone.
2011-10-03 23:25:09 +01:00
e77c919290
Remove usage of Linden packet types from inside Attachments Module and interface
2011-10-03 11:55:54 -07:00
31125a5fd2
Add execute permission to runprebuild2010.bat
2011-10-03 11:16:48 -07:00
56dbab35e1
Remove unimplementated UpdateMovement() methods from SOG, SOP.
...
SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase.
No point making the code more complex until it actually needs to be,
2011-10-01 01:26:50 +01:00
42fe774ad1
Remove OpenSim.Region.Examples.SimpleModule
...
This module is more than 2 years old and at least some of the 'example' code it gives is now misleading.
Even the logs say it say some bits were broken where it was put in!
2011-10-01 01:21:20 +01:00
c7db3df344
llGetLinkKey, llGetLinkName Fix for sitting Avatar
...
when an avatar sits on a prim, we get now his key & name ;-)
http://opensimulator.org/mantis/view.php?id=4476
2011-10-01 00:41:47 +01:00
a1875ec760
Add ability to pass in the permissions option (perm) to save oar via RemoteAdmin
...
Applies patch in http://opensimulator.org/mantis/view.php?id=5686
Thanks Michelle Argus!
2011-10-01 00:19:09 +01:00
246443773a
minor: remove clutter null check from pass in config to AvatarFactoryModule.Initialize()
...
This is never null
2011-10-01 00:15:30 +01:00
844b4f3a16
copy config information on allow/disallow individual os functions into OpenSim.ini.example
...
I this is generally useful rather than a 'default' setting
2011-09-30 23:55:02 +01:00
6d0978594d
remove unused postgresql dll
2011-09-30 18:58:26 +01:00
e742cffe15
Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
...
This is for debugging purposes. Defaults to Attachments Enabled
2011-09-30 01:19:22 +01:00
528fcede6c
llAvatarOnLinkSitTarget Implementation
...
http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
2011-09-29 01:08:05 +01:00
a3531dec1a
Add en_US culture setting to the async delete to inventory thread, to avoid any issues with float serialization with machines set to non en_US locales.
...
Doing this to see if addresses inventory object deserialization problems in http://opensimulator.org/mantis/view.php?id=5708 , though if it does I'm really surprised not to have seen it before now.
Really need to go through and systematically set the culture for every timer and change all BeginInvoke calls to FireAndForget instead.
But don't want to do something like that this close to a release.
2011-09-26 23:00:16 +01:00
2b2580e3a1
Fix for rezzing and derezzing HUDs (see Mantis #5406 ). From now on updates are only sent to affected clients.
2011-09-25 00:51:43 +02:00
Dan Lake