UbitUmarov
5f364dbed5
another change to standup
2014-07-20 16:09:34 +01:00
UbitUmarov
d6f56a4f99
change avatar standup code
2014-07-20 16:03:05 +01:00
UbitUmarov
a5fcc0c0c0
remove avn hack on sitted avatars positions
2014-07-20 14:47:35 +01:00
UbitUmarov
79aea3e588
physicsSit SendSitResponse also relative to parent prim
2014-07-20 09:21:00 +01:00
UbitUmarov
931434de87
fix physics sit for physical child prims
2014-07-20 09:15:29 +01:00
UbitUmarov
32b060a608
physics engine cannot change internal positions of linksets, at least not
...
in teaseupdates
2014-07-20 05:54:51 +01:00
Melanie Thielker
b3068355bc
Merge branch 'ubitworkmaster'
2014-07-20 02:27:08 +02:00
UbitUmarov
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
Melanie Thielker
bef76bf3c5
Fix duplicate attach message being sent to objects picked up from the ground
2014-07-20 01:52:26 +02:00
Melanie Thielker
5000a5c038
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:17:35 +02:00
Melanie Thielker
07c0ee1fbf
Fix taking objects
2014-07-19 23:17:26 +02:00
Melanie Thielker
e1b2ecdfdc
Merge branch 'avination-current'
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
UbitUmarov
95b89dd450
fix attachments
2014-07-19 22:18:12 +02:00
UbitUmarov
9654b81b2d
revert to capsule representation of avatar collider
2014-07-19 16:16:13 +01:00
UbitUmarov
748fc66ef1
reduce avatar hover in basic ode plugin
2014-07-18 13:19:24 +01:00
UbitUmarov
d5e0437465
fix Xengine script instance load
2014-07-18 11:43:31 +01:00
UbitUmarov
19d33c571d
Merge branch 'avination-current' into ubitwork
2014-07-16 16:22:32 +01:00
UbitUmarov
fc1bd4567d
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2014-07-16 16:16:37 +01:00
Melanie Thielker
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
Melanie Thielker
527c2cdb1e
Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'
2014-06-21 00:23:11 +02:00
Melanie Thielker
5908e7d0c2
Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'
2014-06-21 00:22:51 +02:00
Melanie Thielker
711441f922
Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2'
2014-06-21 00:21:29 +02:00
Melanie Thielker
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
Melanie Thielker
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
Justin Clark-Casey (justincc)
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
Dev Random
fb321a0573
Prevent sending Land Properties for unprivileged users
2014-04-23 22:59:13 +01:00
Melanie Thielker
f93dac9239
Implement Oren's fix to prevent a privilege escalation with groups
2014-04-20 10:47:31 +02:00
Melanie Thielker
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
Melanie Thielker
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
Melanie Thielker
075cf2baa3
Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels
2014-03-25 03:17:04 +01:00
Melanie Thielker
17aeec8860
Reinstate the timed region change signal
2014-03-25 03:16:37 +01:00
Melanie
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
Melanie
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
Justin Clark-Casey (justincc)
cd35d298fa
Merge branch 'justincc-master'
2014-01-28 00:23:10 +00:00
Oren Hurvitz
2cf224166f
Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions
2014-01-28 00:11:50 +00:00
Justin Clark-Casey (justincc)
f7172095e0
Convert tabs to spaces from previous commit 8c2b41b01
2014-01-28 00:04:55 +00:00
Dev Random
8c2b41b01d
Make inidirectory files supercede distro files
2014-01-27 23:56:10 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e2fbc88d98
Re-enabled NPCModuleTests.TestCreate()
2014-01-27 22:56:51 +00:00
Justin Clark-Casey (justincc)
0eda7dd1c7
Merge branch 'justincc-master'
2014-01-24 19:41:41 +00:00
Justin Clark-Casey (justincc)
fea8345f56
minor: remove long unused state queue from "show queues" console reports
2014-01-24 19:40:14 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
966ab21839
Merge branch 'justincc-master'
2014-01-24 00:17:39 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Mic Bowman
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
dahlia
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
dahlia
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
