Melanie
62b1c807c2
Also add OSS header to interface
2012-03-29 01:14:50 +01:00
Melanie
bd83676d6c
Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header
2012-03-29 01:13:08 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
a1de9bc33f
Revert "Add comment about setting client.SceneAgent in AddNewClient()"
...
This reverts commit 964cae4f37
.
2012-03-29 01:08:37 +01:00
Melanie
b8abd92fc7
Merge branch 'master' into careminster
2012-03-29 00:47:45 +01:00
Melanie
c52ff5cf7b
Committing the Avination calling card module
2012-03-29 00:47:09 +01:00
Melanie
5a82d939e6
Adding the Avination calling card interface
2012-03-29 00:34:28 +01:00
Melanie
532e3dad26
Pushing the Avination Calling card hooks. Module to follow.
2012-03-29 00:31:11 +01:00
Justin Clark-Casey (justincc)
964cae4f37
Add comment about setting client.SceneAgent in AddNewClient()
2012-03-29 00:21:14 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
7aa0c05fba
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 23:38:04 +01:00
Justin Clark-Casey (justincc)
33df0c2efd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 23:36:30 +01:00
Robert Adams
4138880464
BulletSim: update 64 bit libraries and change Linux configuration to use the files in the lib32 and lib64 directories as needed.
2012-03-28 15:36:20 -07:00
Diva Canto
6bf4d88397
HG 2.0 Suitcase inventory: proof of concept now working properly with the heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message.
2012-03-28 15:32:19 -07:00
Justin Clark-Casey (justincc)
874bf1f8e5
Enable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoiceInfoRequest bug
...
Viewer 2/3 contains a bug where the viewer will constantly retry ParcelVoiceInfoRequest requests on voice-disabled parcels where voice is otherwise available.
Attempts to fix this server-side have not been successful - sending a non-OK http code (e.g. a 404) just makes the viewer request again immediately.
Dropping the request entirely is a bit better but the viewer still retries after a minute.
Estate settings already enabled voice by default so doing the same for parcels. This only has an effect if you have any voice system active at all.
Ultimately, the re-request bug needs to be fixed viewer-side (LL suffers from the same issue!) but it might be worth implementing the drop request hack.
2012-03-28 23:30:28 +01:00
Diva Canto
51dc1e709c
HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival.
2012-03-28 15:01:37 -07:00
Melanie
a85876bc17
Committing the Avination calling card module
2012-03-28 23:51:44 +02:00
Melanie
7dad1ded2e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-29 00:27:35 +01:00
UbitUmarov
1888e174cd
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-28 17:51:56 +01:00
Melanie
e73023b90b
Merge branch 'master' into careminster
2012-03-28 04:45:05 +01:00
Diva Canto
03766c010f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 20:38:02 -07:00
Diva Canto
af96b99356
More on switching the root folder from under the viewer. More experiments.
2012-03-27 20:36:54 -07:00
Melanie
614c404923
Typo fix
2012-03-28 03:45:52 +01:00
Diva Canto
4007f62158
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 19:09:03 -07:00
Diva Canto
300968e933
HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarded by an obscure config that no one but me should be using at this point.
2012-03-27 19:08:29 -07:00
Melanie
b24605d526
Fix typos
2012-03-28 02:55:29 +01:00
Justin Clark-Casey (justincc)
514a9fdf8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 02:52:11 +01:00
Justin Clark-Casey (justincc)
12d3ea3029
Add "friends show cache <first-name> <last-name>" command for debugging purposes.
...
This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
2012-03-28 02:51:34 +01:00
Melanie
a43e804e59
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-28 02:46:31 +01:00
Melanie
0463a00d34
Start on Bulk inventory update via CAPS. Not functional yet. HG v2
2012-03-28 02:45:50 +01:00
Melanie
8c0f1e9058
Add a corresponding method for items. HG v2
2012-03-28 02:10:07 +01:00
Melanie
710c14fb57
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:49:06 +01:00
Melanie
4ab63bfe97
Typo fix
2012-03-28 02:33:15 +02:00
Melanie
caaf25c326
Merge branch 'master' into careminster
2012-03-28 02:56:31 +01:00
Melanie
300488f862
Merge branch 'master' into careminster
2012-03-28 02:46:54 +01:00
Melanie
b519cf6383
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2012-03-28 02:20:40 +01:00
Justin Clark-Casey (justincc)
445e8bc560
minor: Add some documentation to OnNewClient and OnClientClosed events
2012-03-28 01:08:56 +01:00
Justin Clark-Casey (justincc)
cb41fb64be
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 01:06:18 +01:00
Melanie
2a8b9a47b2
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:15:56 +02:00
Melanie
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
Melanie
37603ca6da
Reverse a conditional in XInventory that made updating system folder evrsion numbers impossible
2012-03-27 23:11:06 +01:00
Diva Canto
db5f46fa23
Let grided simulators retrieve the user's inventory skeleton
2012-03-27 15:24:55 -07:00
Justin Clark-Casey (justincc)
b74a89bc12
minor: clean up some code formatting in VivoxVoiceModule.cs
2012-03-27 22:33:42 +01:00
Diva Canto
5e07336672
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 14:25:36 -07:00
Diva Canto
91950b3147
Amend to previous commit regarding the config name. Bugs bite.
2012-03-27 14:24:59 -07:00
UbitUmarov
de45fe7515
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-27 21:58:25 +01:00
Snoopy Pfeffer
19837ff4dd
Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
2012-03-27 22:30:02 +02:00
Snoopy Pfeffer
5d37a31436
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-03-27 22:16:25 +02:00
Snoopy Pfeffer
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
Dan Lake
971d32fda3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 12:51:58 -07:00