aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-075-228/+211
|
* Port Avination's inventory send throttlingMelanie2013-06-051-0/+108
|
* Adding standard OpenSim header to source filesBlueWall2013-05-311-0/+27
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-301-0/+90
|\
| * UserProfilesBlueWall2013-05-301-0/+90
| | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-301-0/+20
|/ | | | | display of groups of animations (Equal(), ToString(), FromOSDArray(), ...). No functional change to animations.
* Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-252-4/+4
| | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
* This is an experimental patch that adds support for comparing textureMic Bowman2013-05-242-33/+67
| | | | | | | | | | hashes for the purpose of accurately responding to AgentTextureCached packets. There is a change to IClientAPI to report the wearbles hashes that come in through the SetAppearance packet. Added storage of the texture hashes in the appearance. While these are added to the Pack/Unpack (with support for missing values) routines (which means Simian will store them properly), they are not currently persisted in Robust.
* To further help with tracking down the apperance of too much "Unknown User" ↵Justin Clark-Casey (justincc)2013-05-211-1/+1
| | | | | | | in chatlogs, etc. temporarily change each instance of this in OpenSimulator so we can identify where it's coming from For instance, the "Unknown User" in Util.ParseUniversalUserIdenitifer becaomes "Unknown UserUPUUI (class initials + method initials) This is to help with http://opensimulator.org/mantis/view.php?id=6625
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-112-2/+16
|\
| * Implement delete key for local consoleJustin Clark-Casey (justincc)2013-05-091-0/+15
| |
| * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-2/+1
| |
* | Send up the part missing from the Avination Estate commit.Melanie2013-05-111-1/+33
|/ | | | Warning - contains a small migration.
* Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-082-0/+51
| | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* Added AvatarPickerSearch capability handler.Diva Canto2013-05-071-0/+47
|
* On startup, start scenes after we're set up all local scenes, rather than ↵Justin Clark-Casey (justincc)2013-05-031-1/+6
| | | | | | | starting scenes before others have been created. This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created. http://opensimulator.org/mantis/view.php?id=6618
* Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-011-10/+10
| | | | | | | | | | SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those. However, two changes have been made to stock 2.2.3. Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified. This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled. Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
* Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-251-1/+1
| | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI.
* Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
|
* If OpenSimulator is writing a PID file and finds the file already present on ↵Justin Clark-Casey (justincc)2013-04-091-0/+5
| | | | | | startup, logging an error since this is commonly due to an unclean shutdown. Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
* * In between the fog, a moment of clarity. This fixes mantis 6570teravus2013-04-041-1/+1
|
* Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+15
| | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* Prevent multiple instances of the same item ID being appended to an ↵Justin Clark-Casey (justincc)2013-03-191-30/+48
| | | | | | | | AvatarAppearance It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID). However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there. This commit requires both simulator and service to be updated.
* For the moment, disable the output of the 'scene' statistics in ↵Robert Adams2013-03-191-1/+3
| | | | | | | SimExtraStatsCollector and thus for the command 'show stats' because it is ugly and most of the information is already output in the formatted printout that appears before.
* *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a ↵teravus2013-03-161-3/+14
| | | | connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
* Log same environment information to Robust log as is already done for ↵Justin Clark-Casey (justincc)2013-03-142-11/+21
| | | | simulator logs, for debug purposes
* Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵Justin Clark-Casey (justincc)2013-03-141-0/+7
| | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method
* minor: Remove some mono compiler warnings in OpenSim.Framework.dllJustin Clark-Casey (justincc)2013-03-132-3/+3
|
* Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-132-1/+99
| | | | | | | | | This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes. This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes. This commit adds a DOExampleModule to demonstrate/evolve this code. Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap. DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later. These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-03-051-1/+16
|\
| * * Add a Max Payload size property to the Websocket Server Handler. If you ↵teravus2013-03-051-1/+16
| | | | | | | | would like to restrict the maximum packet size, (and therefore protect against Memory DOSing) then you should set this. I defaulted it to 40MB. This means that in theory, a malicious user could connect and send a packet that claims that the payload is up to 40 mb (even if it doesn't actually turn out to be 40mb. More testing needs to be done on it where the packets are maliciously malformed.
* | Add method to remove JsonRpc Handlers from the serverBlueWall2013-03-032-0/+8
|/
* Show http poll handlers in separate http (poll) section of "show ↵Justin Clark-Casey (justincc)2013-02-271-2/+5
| | | | | | http-handlers" console command instead of never showing them (due to a previous bug). The code was assuming that poll handlers were also included in general http handlers but this was not the case.
* Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-274-68/+81
| | | | places where we were not already.
* Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-6/+21
| | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
* Make StatsManager default output a little more readableRobert Adams2013-02-241-1/+1
|
* Add EventHistogram.GetHistogramAsOSDMap that returns that parametersRobert Adams2013-02-241-211/+228
| | | | about the histogram as well as the values.
* Modify StatsManager so console command "show stats category container"Robert Adams2013-02-241-5/+24
| | | | only outputs the statistics in the specified container in the category.
* Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-221-0/+38
| | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-212-1/+234
|\
| * Add a virtual ToOSDMap() function to Monitoring.Stat for futureRobert Adams2013-02-211-0/+16
| | | | | | | | overloading by aggregation statistics and browser based stat viewers.
| * Add CounterStat which is a wrapper for a counter stat but, becauseRobert Adams2013-02-212-1/+218
| | | | | | | | | | | | | | the 'count' event is internal, historical data can be built it. Also includes EventHistogram class for building time based, bucketed history of event occurances. Make Stat implement IDisposable for subclasses that might need it.
* | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-211-1/+21
|/ | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
* Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-205-4/+77
| | | | | | Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format).
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-2010-10/+9
|\
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1910-10/+9
| |
* | Correct mistake in parsing 'show object pos' and similar pos commands where ↵Justin Clark-Casey (justincc)2013-02-201-4/+4
|/ | | | | | the 'to' text would be treat as the end vector rather than discarded. Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
* Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-141-0/+2
|\
| * * gracefully handle a Situation where a double close is called on the ↵teravus2013-02-141-0/+2
| | | | | | | | WebSocket handler
* | Use SortedDictionary in StatsManager instead of regular Dictionary so stats ↵Dan Lake2013-02-142-22/+22
|/ | | | will interate and print in a defined order