dbec5e9859
Fix more merge artefacts
2012-04-03 23:22:47 +02:00
7154d480b9
Remove duplicate implementation of Material { get; set; }
2012-04-03 23:18:07 +02:00
1c4bcf3fed
Fix merge artefacts
2012-04-03 23:13:48 +02:00
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
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
633f4bb3d8
remove possible PhysActor unexpectedly null race conditions when changing prim collision status
...
factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
2012-04-03 09:28:17 +01:00
e480e25d8b
Fix more SOP.PhysActor race conditions in LSL_Api
2012-04-03 06:01:05 +01:00
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
d5e123c106
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-01 11:20:11 +01:00
1d8aefd22d
Merge branch 'master' into careminster
2012-03-31 02:33:16 +01:00
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
a6c26b093c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-31 02:31:57 +01:00
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
32a953fed7
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
2012-03-31 01:52:06 +01:00
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
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
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
69fc8c4985
minor: small message adjustment and unnecessary code elimination when notifying client of no build permission
2012-03-31 01:07:14 +01:00
c2b98cfd4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-31 01:04:38 +01:00
874140f950
fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932
2012-03-31 01:01:59 +01:00
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
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
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
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
269e479cdc
minor: remove some now unneeded code from FriendsCommandsModule
2012-03-30 02:00:01 +01:00
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
1ef62ca75e
Lock NullFriendsData.m_Data for consistency and against concurrent read/write
2012-03-30 01:23:34 +01:00
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
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
b8d383da0a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-30 00:38:23 +01:00
30db0ac5e2
Finish up the SuitcaseInventory service.
2012-03-29 16:25:55 -07:00
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
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
b9d61d5413
Allow the map tile module to be enabled without also eabling refresh
2012-03-29 15:38:12 +02:00
807bb85ac2
Allow llTeleportAgent to work in attachments
2012-03-29 14:45:56 +02:00
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
cd3f3cbdde
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-29 01:29:00 +01:00
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
62b1c807c2
Also add OSS header to interface
2012-03-29 01:14:50 +01:00
bd83676d6c
Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header
2012-03-29 01:13:08 +01:00
93ac47f0d3
Revert "Simplify friends caching by only doing this for root agents - no functions require caching for child agents."
...
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators.
This reverts commit d9f7b8549b
2012-03-29 01:08:47 +01:00
a1de9bc33f
Revert "Add comment about setting client.SceneAgent in AddNewClient()"
...
This reverts commit 964cae4f37
2012-03-29 01:08:37 +01:00
b8abd92fc7
Merge branch 'master' into careminster
2012-03-29 00:47:45 +01:00
c52ff5cf7b
Committing the Avination calling card module
2012-03-29 00:47:09 +01:00
5a82d939e6
Adding the Avination calling card interface
2012-03-29 00:34:28 +01:00
532e3dad26
Pushing the Avination Calling card hooks. Module to follow.
2012-03-29 00:31:11 +01:00
964cae4f37
Add comment about setting client.SceneAgent in AddNewClient()
2012-03-29 00:21:14 +01:00
d9f7b8549b
Simplify friends caching by only doing this for root agents - no functions require caching for child agents.
...
This allows us to avoid unnecessary multiple calls to the friends service.
All friends functions originate from the root agent and only go to other root agents in existing code.
This also allows us to eliminate complex ref counting.
2012-03-28 23:40:25 +01:00
7aa0c05fba
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 23:38:04 +01:00
33df0c2efd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 23:36:30 +01:00
Melanie