Melanie
6378abb966
Merge branch 'ubitwork'
2012-04-04 23:57:09 +02:00
Melanie
51d7bffb46
Merge branch 'master' into careminster
2012-04-05 00:48:27 +01:00
Melanie
a5d6b624f6
Simplify group access checks and break them out into a separate method.
...
Use existing cache if the avatar is within the region and use an
ExpiringCache to cache status if the avatar is not in the region. The
30 second delay now applies to scripted objects ony and only when the owner
is not present.
2012-04-05 00:45:58 +01:00
Snoopy Pfeffer
36c8fa16c0
Implements group based access restrictions for parcels of land. Because of caching there can be a delay of up to 30 seconds until the access rights are effectively changed for a user.
2012-04-05 00:53:40 +02:00
Melanie
77caa286a4
Remove some unneeded parens
2012-04-04 23:48:37 +02:00
Melanie
c7419a4d61
Adjust Snoopy's contribution for AVN
2012-04-05 00:36:30 +01:00
Melanie
3a0aac97b4
Merge branch 'master' into careminster
2012-04-04 23:57:50 +01:00
UbitUmarov
016079ef27
minor changes.. a few physicsactor -> pa and a use a constant with |'ed bit fields in place of 6 individual checks ||'ed
2012-04-04 18:24:56 +01:00
UbitUmarov
867d50d14c
remove more merge artefacts
2012-04-04 17:01:29 +01:00
UbitUmarov
787cc0d076
reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque).
2012-04-04 16:38:29 +01:00
UbitUmarov
823895b997
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-04 15:43:07 +01:00
Melanie
726915e9ef
Fix the last merge artefacts
2012-04-03 23:38:12 +02:00
Melanie
1bded840b9
More artefact
2012-04-03 23:25:34 +02:00
Melanie
dbec5e9859
Fix more merge artefacts
2012-04-03 23:22:47 +02:00
Melanie
7154d480b9
Remove duplicate implementation of Material { get; set; }
2012-04-03 23:18:07 +02:00
Melanie
1c4bcf3fed
Fix merge artefacts
2012-04-03 23:13:48 +02:00
Melanie
63c44719f7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-03 23:52:53 +01:00
Garmin Kawaguichi
9a9923405a
terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-03 20:06:03 +01:00
Justin Clark-Casey (justincc)
e480e25d8b
Fix more SOP.PhysActor race conditions in LSL_Api
2012-04-03 06:01:05 +01:00
Justin Clark-Casey (justincc)
7468299673
Eliminate race condition where many callers would check SOP.PhysicsActor != null then assume it was still not null in later code.
...
Another thread could come and turn off physics for a part (null PhysicsActor) at any point.
Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs
No obvious reason for doing that copy - nothing else does it.
2012-04-03 05:51:38 +01:00
UbitUmarov
d5e123c106
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-01 11:20:11 +01:00
Melanie
1d8aefd22d
Merge branch 'master' into careminster
2012-03-31 02:33:16 +01:00
Melanie
6e7f13a72d
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 02:32:47 +01:00
Melanie
a6c26b093c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-31 02:31:57 +01:00
Melanie
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
Justin Clark-Casey (justincc)
32a953fed7
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
2012-03-31 01:52:06 +01:00
Justin Clark-Casey (justincc)
f0406f9fe2
Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ContainsPart method and remove method duplication.
...
HasChildPrim is also misleading since the 'root' prim can also be returned.
2012-03-31 01:45:37 +01:00
Justin Clark-Casey (justincc)
387d7fdad5
Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secondlife.com/wiki/LlRegionSayTo
...
Addresses http://opensimulator.org/mantis/view.php?id=5950
2012-03-31 01:29:13 +01:00
Justin Clark-Casey (justincc)
38d241a317
Add MSSQL login processing fix for servers run on different locales.
...
This may no longer be an issue with better locale enforcement in OpenSimulator but it doesn't hurt to have this patch.
http://opensimulator.org/mantis/view.php?id=4680
Thanks to controlbreak for this
2012-03-31 01:12:04 +01:00
Justin Clark-Casey (justincc)
69fc8c4985
minor: small message adjustment and unnecessary code elimination when notifying client of no build permission
2012-03-31 01:07:14 +01:00
Justin Clark-Casey (justincc)
c2b98cfd4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-31 01:04:38 +01:00
PixelTomsen
874140f950
fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932
2012-03-31 01:01:59 +01:00
Melanie
8728b9ea81
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 01:34:39 +02:00
UbitUmarov
c4e4e04eee
reduced instability in vertical atractor with eficiency of 1 and banking
...
this will need a nicer solution sometime...
2012-03-31 00:03:45 +01:00
Diva Canto
5a8ed50639
Added missing dependency for MS 2008. I hope. (I don't have 2008 to test this) mantis #5949
2012-03-30 12:39:45 -07:00
Justin Clark-Casey (justincc)
e5343bccdf
Add Extended flavour option to opensim version information.
...
This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable.
This flavour will almost certainly never see a formal release.
2012-03-30 02:11:32 +01:00
Justin Clark-Casey (justincc)
269e479cdc
minor: remove some now unneeded code from FriendsCommandsModule
2012-03-30 02:00:01 +01:00
Justin Clark-Casey (justincc)
3525c876c8
Make default "show friends" console command show friends fetched from the friends service.
...
There is no a --cache option which will show friends from the local cache if available.
2012-03-30 01:57:38 +01:00
Justin Clark-Casey (justincc)
1ef62ca75e
Lock NullFriendsData.m_Data for consistency and against concurrent read/write
2012-03-30 01:23:34 +01:00
Justin Clark-Casey (justincc)
bce7964ac2
refactor: Move "friends show cache" console command out into separate FriendsCommandsModule.
...
Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
2012-03-30 01:05:29 +01:00
Justin Clark-Casey (justincc)
59157d9d63
Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.
...
Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology.
Add some method doc.
2012-03-30 00:42:55 +01:00
Justin Clark-Casey (justincc)
b8d383da0a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-30 00:38:23 +01:00
Diva Canto
30db0ac5e2
Finish up the SuitcaseInventory service.
2012-03-29 16:25:55 -07:00
Melanie
5e3999c84c
Cache the last maptile and return the cachrd tile if the last request is
...
less than an hour ago. Avoids generating the maptile twice on startup.
2012-03-29 22:34:33 +02:00
Justin Clark-Casey (justincc)
bf09d6a22b
refactor: Stop passing both IClientAPI and agentID to friend event listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
2012-03-29 18:31:57 +01:00
Melanie
b9d61d5413
Allow the map tile module to be enabled without also eabling refresh
2012-03-29 15:38:12 +02:00
Melanie
807bb85ac2
Allow llTeleportAgent to work in attachments
2012-03-29 14:45:56 +02:00
Justin Clark-Casey (justincc)
012b01f224
Add simple regression test for logging in with offline friends. Don't expect to receive any in this instance.
2012-03-29 03:19:45 +01:00
Justin Clark-Casey (justincc)
cd3f3cbdde
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-29 01:29:00 +01:00
Justin Clark-Casey (justincc)
22a85b947a
Add back parts of reverted changes that were not concerned with child agent caching.
...
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
2012-03-29 01:26:30 +01:00