32b060a608
physics engine cannot change internal positions of linksets, at least not
...
in teaseupdates
2014-07-20 05:54:51 +01:00
b3068355bc
Merge branch 'ubitworkmaster'
2014-07-20 02:27:08 +02:00
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
bef76bf3c5
Fix duplicate attach message being sent to objects picked up from the ground
2014-07-20 01:52:26 +02:00
95f0d582a5
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:18:28 +02:00
5000a5c038
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:17:35 +02:00
b4a3ed1863
Merge branch 'ubitworkmaster'
2014-07-19 23:33:28 +02:00
07c0ee1fbf
Fix taking objects
2014-07-19 23:17:26 +02:00
5b8d1f0719
refix originalPositions[]
2014-07-19 22:16:59 +01:00
e1b2ecdfdc
Merge branch 'avination-current'
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
95b89dd450
fix attachments
2014-07-19 22:18:12 +02:00
9654b81b2d
revert to capsule representation of avatar collider
2014-07-19 16:16:13 +01:00
748fc66ef1
reduce avatar hover in basic ode plugin
2014-07-18 13:19:24 +01:00
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
UbitUmarov