| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
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"
|
| |\
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| |
| |
| |
| | |
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.
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
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.
|
| |\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| | |
| |
| |
| | |
simulator logs, for debug purposes
|
| | |
| |
| |
| |
| |
| | |
input to GetLandObject()
This conforms to the existing ILandChannel.ParcelsNearPoint() method
|
| |\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
rather"
This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
|
| | | |
| | |
| | |
| | | |
than through the update system.
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
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.
|
| | |/ / |
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
|
| | | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
|
| | | |
| | |
| | |
| | | |
places where we were not already.
|
| |\ \ \
| |/ / |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | | |
|
| | | |
| | |
| | |
| | | |
about the histogram as well as the values.
|
| | | |
| | |
| | |
| | | |
only outputs the statistics in the specified container in the category.
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
|
| | | |
| | |
| | |
| | | |
one I added yesterday -- this is for helping move config vars out of [Startup]
|
| |\ \ \
| |/ / |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
overloading by aggregation statistics and browser based stat viewers.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | |/ /
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
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).
|
| | |\ \ |
|
| | | | | |
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
WebSocket handler
|
| | |/ /
| | |
| | |
| | | |
will interate and print in a defined order
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
|
| | | |
| | |
| | |
| | | |
incorrect
|
| | | | |
|
| |\ \ \
| | |/
| |/| |
|
| | | | |
|
| |\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
bin/HttpServer_OpenSim.dll
|
