aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Minor improvements to loggingOren Hurvitz2012-04-241-0/+4
| | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
* Refactored how asset/inventory types are associated with content types: ↵Oren Hurvitz2012-04-242-228/+177
| | | | gathered all the knowledge into a single class. Added the Mesh content type.
* Mantis 5977 Corrections to llRegionSayToTalun2012-04-231-0/+20
| | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* Add more exception detail to Exception and IOException throws in ↵Justin Clark-Casey (justincc)2012-04-201-2/+2
| | | | BaseHttpServer.HandleRequest()
* refactor: Rename EstateSettings.IsEstateManager() to ↵Justin Clark-Casey (justincc)2012-04-172-4/+4
| | | | | | | EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does. This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities. As per opensim-dev mailing list.
* Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
|
* Add Extended flavour option to opensim version information.Justin Clark-Casey (justincc)2012-03-301-1/+2
| | | | | This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable. This flavour will almost certainly never see a formal release.
* refactor: Stop passing both IClientAPI and agentID to friend event ↵Justin Clark-Casey (justincc)2012-03-291-3/+3
| | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
* Add back parts of reverted changes that were not concerned with child agent ↵Justin Clark-Casey (justincc)2012-03-291-1/+1
| | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents.
* Change namespace on CallingCardModule and correct interface file placemant. ↵Melanie2012-03-291-13/+0
| | | | Also ass OpenSource header
* Revert "Simplify friends caching by only doing this for root agents - no ↵Justin Clark-Casey (justincc)2012-03-291-1/+1
| | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
* Adding the Avination calling card interfaceMelanie2012-03-291-0/+13
|
* Simplify friends caching by only doing this for root agents - no functions ↵Justin Clark-Casey (justincc)2012-03-281-1/+1
| | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting.
* Enable voice by default on parcels to weaken effects of viewer 2/3 ↵Justin Clark-Casey (justincc)2012-03-281-1/+1
| | | | | | | | | | ParcelVoiceInfoRequest bug Viewer 2/3 contains a bug where the viewer will constantly retry ParcelVoiceInfoRequest requests on voice-disabled parcels where voice is otherwise available. Attempts to fix this server-side have not been successful - sending a non-OK http code (e.g. a 404) just makes the viewer request again immediately. Dropping the request entirely is a bit better but the viewer still retries after a minute. Estate settings already enabled voice by default so doing the same for parcels. This only has an effect if you have any voice system active at all. Ultimately, the re-request bug needs to be fixed viewer-side (LL suffers from the same issue!) but it might be worth implementing the drop request hack.
* Start on Bulk inventory update via CAPS. Not functional yet. HG v2Melanie2012-03-281-0/+2
|
* Add a corresponding method for items. HG v2Melanie2012-03-281-0/+1
|
* Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-0/+37
| | | | folders from the viewer's inventory view. For HG v2.0. More to come
* Allow the user to enter help topics in upper or lowercase.Justin Clark-Casey (justincc)2012-03-241-10/+12
| | | | | Forcing uppercase (e.g. help Assets) is too annoying. Thanks to WhiteStar for pointing this out.
* Give feedback when "terrain save-tile" is not successfully invoked.Justin Clark-Casey (justincc)2012-03-241-0/+6
|
* Rework Diva's patch to simplify itMelanie2012-03-221-0/+1
|
* Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵Melanie2012-03-221-2/+0
| | | | | | DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
* Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. ↵Diva Canto2012-03-221-0/+2
| | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
* Instead of loading default avatar animations in both SLUtil and ↵Justin Clark-Casey (justincc)2012-03-212-51/+2
| | | | | | | | AvatarAnimations, load just in AvatarAnimations instead. This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST. This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND") but scripts refer to them with lowercase names (e.g. "sit").
* If "debug scene updates true" then print out to log when a garbage ↵Justin Clark-Casey (justincc)2012-03-211-0/+62
| | | | collection occurs.
* Refix the fixed fix!Melanie2012-03-211-2037/+2037
|
* Fixed borkness with previous merge.Diva Canto2012-03-201-16/+1
|
* Line endingsDiva Canto2012-03-201-89/+89
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-61/+89
|\ | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * Move frame loop entirely within Scene.Update() for better future performance ↵Justin Clark-Casey (justincc)2012-03-201-2/+15
| | | | | | | | | | | | | | | | analysis and stat accuracy. Update() now accepts a frames parameter which can control the number of frames updated. -1 will update until shutdown. The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
* | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-1954/+1988
|/ | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)2012-03-161-1/+1
|
* Add total scripts count to "show threads"Justin Clark-Casey (justincc)2012-03-161-2/+10
| | | | However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
* Improve threadpool reporting to "show threads" console command (also gets ↵Justin Clark-Casey (justincc)2012-03-162-7/+57
| | | | printed out periodically)
* Add process working memory to "show stats" memory statistics.Justin Clark-Casey (justincc)2012-03-162-4/+11
| | | | This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
* Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-122-2/+7
| | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-101-1/+51
|\
| * Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)2012-03-091-1/+51
| | | | | | | | | | | | makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. As per opensim-users mailing list discussion.
* | Serialize all web requests to a particular host:port pair; only applied to ↵Mic Bowman2012-03-091-0/+41
|/ | | | the PostToService variants.
* Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-083-33/+103
| | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* Use a fully stubbed out MockConsole for unit tests rather than inheriting ↵Justin Clark-Casey (justincc)2012-03-011-22/+37
| | | | | | | | from CommandConsole. This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands. This prevents the scene from being garbage collected at the end of a test. This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
* Flick master up to 0.7.4Justin Clark-Casey (justincc)2012-02-291-1/+1
|
* Some clean up in WebUtil, remove unused ServiceRequest function.Mic Bowman2012-02-271-71/+7
|
* Take watchdog alarm calling back outside the m_threads lock.Justin Clark-Casey (justincc)2012-02-241-3/+16
| | | | This is how it was originally. This stops a very long running alarm callback from causing a problem.
* Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ↵Justin Clark-Casey (justincc)2012-02-242-2/+2
| | | | returns and for consistency.
* Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-242-17/+42
| | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-211-0/+30
|
* On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-182-2/+40
| | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-133-3/+37
|\
| * Change parser to leave embedded quotes alone if the pattern is recognizedMelanie2012-02-101-0/+34
| | | | | | | | as an OptionSet long option
| * minor: Remove warning from RegionInfo due to repeated config.GetString() ↵Justin Clark-Casey (justincc)2012-02-101-1/+0
| | | | | | | | call where the first was unused.