aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fixed line endings from previous commitDan Lake2011-10-063-51/+51
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-063-13/+6
|\
| * remove the pointless slashes on the end of the (5!) different server stat ↵Justin Clark-Casey (justincc)2011-10-073-13/+6
| | | | | | | | | | | | | | 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.
* | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-065-89/+79
|/ | | | | | 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.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-063-301/+312
|\
| * Simplified IsInTransit property on ScenePresence and removed InTransit() ↵Dan Lake2011-10-062-17/+16
| | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-068-109/+87
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * Added back UserAccount that creates random UUID for new account.BlueWall2011-10-051-0/+11
| | | | | | | | | | | | | | | This should fix recent issues with 3rd party apps that use the old interface w/o breaking the new one.
| * | Refactor ScenePresence so gets and sets are through properties. Added ↵Dan Lake2011-10-061-287/+288
| | | | | | | | | | | | private sets when needed. Removed redundant code when methods replicated what the set already does
* | | WebStats - Home Link FixPixel Tomsen2011-10-061-2/+3
| |/ |/| | | | | http://opensimulator.org/mantis/view.php?id=4536
* | Instead of adding stat agentMS in all kinds of places, calculate it instead ↵Justin Clark-Casey (justincc)2011-10-064-36/+21
| | | | | | | | | | | | | | | | 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
* | rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not ↵Justin Clark-Casey (justincc)2011-10-051-11/+11
| | | | | | | | a single one
* | Add user ID to new estate user prompt, to make it clearer and consistent ↵Justin Clark-Casey (justincc)2011-10-051-1/+1
| | | | | | | | with the main create user prompts
* | Change WebStatsModule to check its config properly, instead of catching the ↵Justin Clark-Casey (justincc)2011-10-051-34/+7
| | | | | | | | | | | | ineviable NullReferenceException! Also, tidy up spacing.
* | Remove unused local variable i from OdeScene.Simulate()Justin Clark-Casey (justincc)2011-10-051-3/+0
| |
* | Make reported sim fps more accurate, in line with frame time msJustin Clark-Casey (justincc)2011-10-053-24/+36
|/ | | | Also remove some unused fields and improve naming on others.
* Removed redundant scene presence lookups in HGMessageTransferModuleDan Lake2011-10-051-21/+4
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-046-18/+37
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-041-1/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-10-046-393/+393
| | |\
| | * | Turn off keepalives when commands are specifiedMic Bowman2011-10-041-1/+1
| | | |
| * | | When creating a new user on the comand line, give the option of allowing a ↵Justin Clark-Casey (justincc)2011-10-044-8/+28
| | |/ | |/| | | | | | | | | | | | | 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.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-044-384/+385
| |\ \
| * | | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine].Justin Clark-Casey (justincc)2011-10-042-9/+8
| | |/ | |/|
* | | Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ↵Dan Lake2011-10-041-14/+2
| |/ |/| | | | | objects already triggers objectkill packet to client. No need to send again.
* | Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵Dan Lake2011-10-044-384/+385
|/ | | | handlers for attachments to call public interface and rearranged module file into sections
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-035-68/+73
|\
| * trival tweak to trigger the continuous integration systemJustin Clark-Casey (justincc)2011-10-041-1/+1
| |
| * Animation-States Turning Left, Turning Right implemented/enabledPixel Tomsen2011-10-041-2/+6
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3036
| * Return NULL_KEY from llGetTexture if a non-existent face is indicated, ↵Justin Clark-Casey (justincc)2011-10-041-1/+1
| | | | | | | | | | | | rather than "" As per http://wiki.secondlife.com/wiki/LlGetTexture
| * For llGetTexture(), if the face texture asset is in the inventory, return ↵Justin Clark-Casey (justincc)2011-10-041-1/+16
| | | | | | | | | | | | | | | | 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!
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-035-12/+11
| |\
| * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-033-63/+49
| | | | | | | | | | | | This appears to be code clutter since the code that uses this has long gone.
* | | Removed redundant code in AttachmentsModule and simplified interfaces which ↵Dan Lake2011-10-036-131/+83
| |/ |/| | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still.
* | Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-034-12/+11
| |
* | Add execute permission to runprebuild2010.batDan Lake2011-10-031-0/+0
|/
* Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-014-17/+1
| | | | | 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,
* Remove OpenSim.Region.Examples.SimpleModuleJustin Clark-Casey (justincc)2011-10-018-1662/+0
| | | | | 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!
* llGetLinkKey, llGetLinkName Fix for sitting AvatarPixel Tomsen2011-10-011-0/+41
| | | | | | when an avatar sits on a prim, we get now his key & name ;-) http://opensimulator.org/mantis/view.php?id=4476
* Add ability to pass in the permissions option (perm) to save oar via RemoteAdminJustin Clark-Casey (justincc)2011-10-011-1/+8
| | | | | Applies patch in http://opensimulator.org/mantis/view.php?id=5686 Thanks Michelle Argus!
* minor: remove clutter null check from pass in config to ↵Justin Clark-Casey (justincc)2011-10-012-8/+14
| | | | | | AvatarFactoryModule.Initialize() This is never null
* copy config information on allow/disallow individual os functions into ↵Justin Clark-Casey (justincc)2011-09-302-19/+38
| | | | | | OpenSim.ini.example I this is generally useful rather than a 'default' setting
* remove unused postgresql dllJustin Clark-Casey (justincc)2011-09-301-0/+0
|
* Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2011-09-305-6/+65
| | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
* llAvatarOnLinkSitTarget ImplementationPixel Tomsen2011-09-293-0/+20
| | | | http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
* Add en_US culture setting to the async delete to inventory thread, to avoid ↵Justin Clark-Casey (justincc)2011-09-261-0/+5
| | | | | | | | 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.
* Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ↵Snoopy Pfeffer2011-09-252-2/+11
| | | | are only sent to affected clients.
* Remove the unimplented "clear assets" command.Justin Clark-Casey (justincc)2011-09-241-9/+0
| | | | | This was a bizarre relic of a bygone age that had no implementations. If you're using and want to clear the flotsam asset cache then please use the existing "fcache clear" command
* Removed uncalled region load method.Kevin Houlihan2011-09-241-30/+0
| | | | The method LoadRegionsPlugin.LoadRegionFromConfig was no longer being referenced from anywhere, so I removed it. It's function has apparently been taken on by the PostInitialise of that module.
* Added a setting to [Startup] section of config that will allow the simulator ↵Kevin Houlihan & Michelle Argus2011-09-246-24/+67
| | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.