d5e0437465
fix Xengine script instance load
2014-07-18 11:43:31 +01:00
19d33c571d
Merge branch 'avination-current' into ubitwork
2014-07-16 16:22:32 +01:00
fc1bd4567d
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2014-07-16 16:16:37 +01:00
159fcbf150
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
527c2cdb1e
Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'
2014-06-21 00:23:11 +02:00
5908e7d0c2
Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'
2014-06-21 00:22:51 +02:00
5694e44ce0
Merge commit '600087ab49e9489e37471ccfb7360ac14d31b7f2'
2014-06-21 00:22:37 +02:00
e0f360e495
Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5'
2014-06-21 00:22:29 +02:00
711441f922
Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2'
2014-06-21 00:21:29 +02:00
94650c43cd
Add forgotten file
2014-06-21 00:08:39 +02:00
d97896d39a
Differentiate between requests only the owner should be able to do and those
...
that managers can do when setting parcel data
2014-04-26 20:32:27 +02:00
1d1e444aed
Convert region loading to new format
2014-04-26 02:43:13 +02:00
5c661baf6c
Allow opening a https port using only http so that nginx can be used for ssl
2014-04-26 02:42:30 +02:00
c77cd6adc7
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
2014-04-23 22:59:28 +01:00
fb321a0573
Prevent sending Land Properties for unprivileged users
2014-04-23 22:59:13 +01:00
f93dac9239
Implement Oren's fix to prevent a privilege escalation with groups
2014-04-20 10:47:31 +02:00
bb841ea9ce
Change OfflineMessageModule to support more differentiated return values and allow support for mobile devices and other non-viewer logins
2014-04-06 23:22:37 +02:00
a30ad71651
Guard against Scene being null in attachments it the wearing avatar is in the process of logging out.
2014-03-25 03:17:44 +01:00
075cf2baa3
Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels
2014-03-25 03:17:04 +01:00
17aeec8860
Reinstate the timed region change signal
2014-03-25 03:16:37 +01:00
c0cdc6b74f
Add delete maptile ability to MapImageService - yet untested
2014-03-18 02:16:00 +01:00
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
cd35d298fa
Merge branch 'justincc-master'
2014-01-28 00:23:10 +00:00
2cf224166f
Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions
2014-01-28 00:11:50 +00:00
f7172095e0
Convert tabs to spaces from previous commit 8c2b41b01
2014-01-28 00:04:55 +00:00
8c2b41b01d
Make inidirectory files supercede distro files
2014-01-27 23:56:10 +00:00
a4017ee1eb
Reinsert attachments list taking code in SP.MakeRootAgent()
...
Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
2014-01-27 23:47:43 +00:00
1b86239f79
refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occur no matter which branch of the conditional is executed
2014-01-27 23:17:09 +00:00
e2fbc88d98
Re-enabled NPCModuleTests.TestCreate()
2014-01-27 22:56:51 +00:00
0eda7dd1c7
Merge branch 'justincc-master'
2014-01-24 19:41:41 +00:00
fea8345f56
minor: remove long unused state queue from "show queues" console reports
2014-01-24 19:40:14 +00:00
c9b5ba78d9
minor: correct the usage statement on the "show image queues" console command - should not have been "image queues show"
2014-01-24 19:36:12 +00:00
4a9796a506
Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) from the "show queues" console report to stop screwing up formatting.
...
"show pquques" already did this
2014-01-24 19:31:31 +00:00
966ab21839
Merge branch 'justincc-master'
2014-01-24 00:17:39 +00:00
a2d5d810e0
Properly dispose of drawing objects to reduce/stop memory leakage on generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
2014-01-24 00:14:58 +00:00
a859464e91
Add "generate map" console command to allow manual regeneration and storage of maptiles
...
Primarily for test purposes though could be useful if one prefers to manually update the map tile
2014-01-23 23:44:21 +00:00
83626e60e6
Adds a configuration option to cannibalize bandwidth from the
...
udp texture throttle and move it to the task throttle. Since most
viewers are using http textures, the udp texture throttle is holding
onto bw that could be used for more responsive prims updates. See
the documentation for CannibalizeTextureRate in OpenSimDefaults.ini.
Option is disabled by default.
2014-01-20 18:59:43 -08:00
7bd42fc42f
Add back code to UuidGatherer to retrieve UUIDs for materials stored in DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented
2014-01-20 15:01:18 -08:00
af58631f00
rather than converting existing materials to assets, just retrieve them and make them available for viewing. Any new materials added to the scene will become assets.
2014-01-20 13:57:14 -08:00
719810e9d8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-20 11:54:36 -08:00
1cae3664a5
add null texture entry face check before converting legacy materials
2014-01-20 11:53:33 -08:00
5fc871027e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-20 19:38:47 +00:00
2cf7478b9a
Merge branch 'justincc-master'
2014-01-20 19:34:55 +00:00
2e78e89c36
Clean up orphaned json stores. This can happen when an object is
...
removed, when a script is removed, or when a script is reset. Also
added a stats command to track the number of json stores used by
a region. Will probably add some more commands later.
2014-01-20 11:33:49 -08:00
8e72b53edc
Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points.
2014-01-20 19:16:19 +00:00
4800303abd
update OpenMetaverse.StructuredData to git master (bf4e9f654ff99c85e20b53e56faac38e307dd8c2) which fixes JSON OSD serialization to a standards compliant means of encoding floating point NaN and Infinity
2014-01-20 03:18:36 -08:00
36d8a24a86
force SOG update when converting legacy materials to ensure changes are persisted
2014-01-20 03:11:01 -08:00
95c926b2cd
delay texture entry parsing until absolutely necessary while converting legacy materials
2014-01-20 03:02:30 -08:00
28723beb0c
Add code to convert legacy materials stored in DynAttrs to new asset format and store them as assets
2014-01-20 02:57:08 -08:00
UbitUmarov